The package rpms/nordugrid-arc.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nordugrid-arc.git/commit/?id=e491....
Change:
-%ifarch ppc64
Thanks.
Full change:
============
commit e4915388023ad3c9b0640178adc99543c8684bf6
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Sun Sep 1 07:08:14 2019 +0200
Update to version 6.2.0
Drop Python 2 bindings for Fedora 32+ and EPEL 8+
Drop infosys-ldap package for Fedora 32+ and EPEL 8+
(requires bdii which is not ported to Python 3)
Build for EPEL 8 (pylint, gfal2 and python-lrms disabled - missing deps)
diff --git a/nordugrid-arc.spec b/nordugrid-arc.spec
index 2ddf853..0c12cd1 100644
--- a/nordugrid-arc.spec
+++ b/nordugrid-arc.spec
@@ -5,46 +5,50 @@
%global with_xrootd %{!?_without_xrootd:1}%{?_without_xrootd:0}
-%if %{?rhel}%{!?rhel:0} == 6
-%ifarch ppc64
-# The python module doesn't build on RHEL6 ppc64 (.toc1 section overflow)
-%global with_python 0
+%if %{?fedora}%{!?fedora:0} >= 32 || %{?rhel}%{!?rhel:0} >= 8
+%global with_python2 0
%else
-%global with_python 1
+%global with_python2 1
%endif
+
+%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7
+%global with_python3 1
%else
-%global with_python 1
+%global with_python3 0
%endif
-%if %{with_python}
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 7
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 7
+# Dependency missing in EPEL 8
%global with_pylint %{!?_without_pylint:1}%{?_without_pylint:0}
%else
%global with_pylint 0
%endif
-%else
-%global with_pylint 0
-%endif
%if %{?fedora}%{!?fedora:0} >= 29 || %{?rhel}%{!?rhel:0} >= 8
%global py3default 1
-%global __defpython python3
-%global __altpython python2
%else
%global py3default 0
-%global __defpython python2
-%global __altpython python3
%endif
%global with_acix 1
%global with_s3 1
+%if %{?rhel}%{!?rhel:0} == 8
+# Dependency missing in EPEL 8
+%global with_gfal 0
+%else
%global with_gfal 1
+%endif
%global with_xmlsec1 %{!?_without_xmlsec1:1}%{?_without_xmlsec1:0}
+%if %{?rhel}%{!?rhel:0} == 8
+# Dependency missing in EPEL 8
+%global with_pythonlrms 0
+%else
%global with_pythonlrms 1
+%endif
%global with_sqlite 1
@@ -56,11 +60,18 @@
%global use_systemd 0
%endif
+%if %{?fedora}%{!?fedora:0} >= 32 || %{?rhel}%{!?rhel:0} >= 8
+# LDAP service requires bdii which is not ported to Python 3
+%global with_ldap_service 0
+%else
+%global with_ldap_service 1
+%endif
+
%global pkgdir arc
Name: nordugrid-arc
-Version: 6.1.0
-Release: 3%{?dist}
+Version: 6.2.0
+Release: 1%{?dist}
Summary: Advanced Resource Connector Middleware
License: ASL 2.0
URL:
http://www.nordugrid.org/
@@ -72,9 +83,15 @@ Obsoletes: %{name}-hopi < 2.0.0
Obsoletes: %{name}-isis < 2.0.0
Obsoletes: %{name}-janitor < 2.0.0
Obsoletes: %{name}-doxygen < 4.0.0
-Obsoletes: %{name}-arcproxyalt < 5.3.0
+Obsoletes: %{name}-arcproxyalt < 6.0.0
Obsoletes: %{name}-java < 6.0.0
Obsoletes: %{name}-egiis < 6.0.0
+%if ! %{with_python2}
+Obsoletes: python2-%{name} < %{version}-%{release}
+%endif
+%if ! %{with_ldap_service}
+Obsoletes: %{name}-infosys-ldap < %{version}-%{release}
+%endif
BuildRequires: gcc-c++
BuildRequires: cppunit-devel
@@ -84,11 +101,10 @@ BuildRequires: systemd-devel
%endif
BuildRequires: libuuid-devel
BuildRequires: gettext
+%if %{with_python2}
BuildRequires: python2-devel
-%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 8
-BuildRequires: python3-devel
%endif
-%if %{?rhel}%{!?rhel:0} == 7
+%if %{with_python3}
BuildRequires: python%{python3_pkgversion}-devel
%endif
%if %{with_pylint}
@@ -164,9 +180,6 @@ BuildRequires: sqlite-devel >= 3.6
%if %{with_ldns}
BuildRequires: ldns-devel >= 1.6.8
%endif
-%if %{use_systemd}
-BuildRequires: systemd
-%endif
%if %{?fedora}%{!?fedora:0} <= 13 && %{?rhel}%{!?rhel:0} <= 6
BuildRequires: python-argparse
Requires: python-argparse
@@ -263,6 +276,7 @@ Connector (ARC).
This package contains the ARC data delivery service.
+%if %{with_ldap_service}
%package infosys-ldap
Summary: ARC LDAP-based information services
BuildArch: noarch
@@ -300,6 +314,7 @@ This package contains the ARC information services relying on BDII
and
LDAP technologies to publish ARC CE information according to various
LDAP schemas. Please note that the information collectors are part of
another package, the nordugrid-arc-arex.
+%endif
%package monitor
Summary: ARC LDAP monitor web application
@@ -325,20 +340,18 @@ Summary: ARC Resource-coupled EXecution service
Requires: %{name} = %{version}-%{release}
Requires: %{name}-hed = %{version}-%{release}
Requires: %{name}-plugins-needed = %{version}-%{release}
-%if %{with_python}
%if %{py3default}
Requires: python3-%{name} = %{version}-%{release}
%else
Requires: python2-%{name} = %{version}-%{release}
%endif
-%endif
Requires: perl(JSON::XS)
Requires: perl(XML::Simple)
%if %{py3default}
-Requires: python3-stomppy
-Requires: python3-ldap
Requires: python3-dirq
Requires: python3-isodate
+Requires: python3-ldap
+Requires: python3-stomppy
%else
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
Requires: python2-dirq
@@ -586,7 +599,7 @@ Connector (ARC).
Header files and libraries needed to develop applications using ARC.
-%if %{with_python}
+%if %{with_python2}
%package -n python2-%{name}
Summary: ARC Python 2 wrapper
%{?python_provide:%python_provide python2-%{name}}
@@ -602,7 +615,7 @@ Connector (ARC).
Python 2 bindings for ARC.
%endif
-%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7
+%if %{with_python3}
%package -n python%{python3_pkgversion}-%{name}
Summary: ARC Python 3 wrapper
%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
@@ -674,6 +687,17 @@ Connector (ARC).
This package contains the archery-manage utility for administration of
an ARCHERY DNS-embedded service endpoint registry.
+%package wn
+Summary: ARC optional worker nodes components
+
+%description wn
+NorduGrid is a collaboration aiming at development, maintenance and
+support of the middleware, known as the Advanced Resource
+Connector (ARC).
+
+This package contains the optional components that provide new job
+management features on the worker nodes (WN).
+
%prep
%setup -q
@@ -686,9 +710,6 @@ if pkg-config --atleast-version 2.6 sigc++-2.0 ; then
fi
%configure --disable-static \
-%if ! %{with_python}
- --disable-swig-python \
-%endif
%if ! %{with_acix}
--disable-acix \
%endif
@@ -698,9 +719,16 @@ fi
%if %{with_s3}
--enable-s3 \
%endif
- --with-python=%{__defpython} \
-%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7
- --with-altpython=%{__altpython} \
+%if %{py3default}
+ --with-python=python3 \
+%if %{with_python2}
+ --with-altpython=python2 \
+%endif
+%else
+ --with-python=python2 \
+%if %{with_python3}
+ --with-altpython=python3 \
+%endif
%endif
%if ! %{with_xrootd}
--disable-xrootd \
@@ -719,6 +747,9 @@ fi
--enable-systemd \
--with-systemd-units-location=%{_unitdir} \
%endif
+%if ! %{with_ldap_service}
+ --disable-ldap-service \
+%endif
--disable-doc \
--with-docdir=%{_pkgdocdir}
@@ -736,8 +767,10 @@ install -p -m 644 debian/%{name}-arex.logrotate \
%{buildroot}%{_sysconfdir}/logrotate.d/%{name}-arex
install -p -m 644 debian/%{name}-gridftpd.logrotate \
%{buildroot}%{_sysconfdir}/logrotate.d/%{name}-gridftpd
+%if %{with_ldap_service}
install -p -m 644 debian/%{name}-infosys-ldap.logrotate \
%{buildroot}%{_sysconfdir}/logrotate.d/%{name}-infosys-ldap
+%endif
install -p -m 644 debian/%{name}-datadelivery-service.logrotate \
%{buildroot}%{_sysconfdir}/logrotate.d/%{name}-datadelivery-service
@@ -786,6 +819,13 @@ make -C src/clients DESTDIR=%{buildroot} install-exampleDATA
# Link to client.conf from doc
ln -s %{_datadir}/%{pkgdir}/examples/client.conf $PWD/docdir/client.conf
+%if ! %{with_ldap_service}
+# These should not be installed with --disable-ldap-service
+rm %{buildroot}%{_datadir}/%{pkgdir}/glite-info-provider-ldap
+rm %{buildroot}%{_datadir}/%{pkgdir}/glue-generator.pl
+rm -rf %{buildroot}%{_datadir}/%{pkgdir}/ldap-schema
+%endif
+
%ldconfig_scriptlets
%ldconfig_scriptlets plugins-globus
@@ -946,6 +986,8 @@ fi
%endif
+%if %{with_ldap_service}
+
%if %{use_systemd}
%post infosys-ldap
@@ -1013,6 +1055,8 @@ semanage fcontext -a -t slapd_etc_t
"/var/run/arc/infosys/bdii-slapd\.conf" 2>/d
semanage fcontext -a -t slapd_db_t "/var/lib/arc/bdii/db(/.*)?" 2>/dev/null
|| :
semanage fcontext -a -t slapd_var_run_t "/var/run/arc/bdii/db(/.*)?"
2>/dev/null || :
+%endif
+
%if %{with_acix}
%if %{use_systemd}
@@ -1206,6 +1250,7 @@ fi
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-gridftpd
%doc %{_mandir}/man8/gridftpd.8*
+%if %{with_ldap_service}
%files infosys-ldap
%if %{use_systemd}
%{_unitdir}/arc-infosys-ldap.service
@@ -1218,8 +1263,8 @@ fi
%{_datadir}/%{pkgdir}/glite-info-provider-ldap
%{_datadir}/%{pkgdir}/glue-generator.pl
%{_datadir}/%{pkgdir}/ldap-schema
-%{_datadir}/%{pkgdir}/PerfData.pl
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-infosys-ldap
+%endif
%files monitor
%{_datadir}/%{pkgdir}/monitor
@@ -1302,6 +1347,7 @@ fi
%{_datadir}/%{pkgdir}/scan_common.sh
%{_datadir}/%{pkgdir}/lrms_common.sh
%{_datadir}/%{pkgdir}/perferator
+%{_datadir}/%{pkgdir}/PerfData.pl
%doc %{_mandir}/man1/arcctl.1*
%doc %{_mandir}/man1/arc-config-check.1*
%doc %{_mandir}/man1/cache-clean.1*
@@ -1333,6 +1379,7 @@ fi
%{_datadir}/%{pkgdir}/rte/ENV/PROXY
%{_datadir}/%{pkgdir}/rte/ENV/RTE
%{_datadir}/%{pkgdir}/rte/ENV/CANDYPOND
+%{_datadir}/%{pkgdir}/rte/ENV/SINGULARITY
%dir %{_datadir}/%{pkgdir}/rte/ENV/CONDOR
%{_datadir}/%{pkgdir}/rte/ENV/CONDOR/DOCKER
%{_sbindir}/a-rex-backtrace-collect
@@ -1489,7 +1536,7 @@ fi
%{_libdir}/%{pkgdir}/libaccARCREST.so
%{_libdir}/%{pkgdir}/libaccARCREST.apd
-%if %{with_python}
+%if %{with_python2}
%files -n python2-%{name}
%doc docdir/python/*
%{python2_sitearch}/_arc.*so
@@ -1504,7 +1551,7 @@ fi
%endif
%endif
-%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7
+%if %{with_python3}
%files -n python%{python3_pkgversion}-%{name}
%{python3_sitearch}/_arc.*so
%if %{py3default}
@@ -1533,7 +1580,17 @@ fi
%files archery-manage
%{_sbindir}/archery-manage
+%files wn
+%attr(4755,root,root) %{_bindir}/arc-job-cgroup
+
%changelog
+* Sat Aug 31 2019 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.2.0-1
+- Update to version 6.2.0
+- Drop Python 2 bindings for Fedora 32+ and EPEL 8+
+- Drop infosys-ldap package for Fedora 32+ and EPEL 8+
+ (requires bdii which is not ported to Python 3)
+- Build for EPEL 8 (pylint, gfal2 and python-lrms disabled - missing deps)
+
* Mon Aug 19 2019 Miro Hronok <mhroncok(a)redhat.com> - 6.1.0-3
- Rebuilt for Python 3.8
diff --git a/sources b/sources
index 4eaecdc..9b18769 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nordugrid-arc-6.1.0.tar.gz) =
172148eda116fe23b58267aa5581a2fc11956add67c254534d1f21ce49d8b5efbbefa244ab1031edae151c0a94478290d95ff9bce94d9167a5a87219e69ea39e
+SHA512 (nordugrid-arc-6.2.0.tar.gz) =
33833b68111f092fbd021dcca187d19047fed238ff8aae390bf8a74959328f3fe9cc26f685d236fca947f7275c34969bb87d788eea8c5c73edc0aecd9e05002a
commit 7928eadee1c5e3187e70e667575fd64dba7a0174
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Mon Aug 19 10:20:54 2019 +0200
Rebuilt for Python 3.8
diff --git a/nordugrid-arc.spec b/nordugrid-arc.spec
index 76cd680..2ddf853 100644
--- a/nordugrid-arc.spec
+++ b/nordugrid-arc.spec
@@ -60,7 +60,7 @@
Name: nordugrid-arc
Version: 6.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Advanced Resource Connector Middleware
License: ASL 2.0
URL:
http://www.nordugrid.org/
@@ -1534,6 +1534,9 @@ fi
%{_sbindir}/archery-manage
%changelog
+* Mon Aug 19 2019 Miro Hronok <mhroncok(a)redhat.com> - 6.1.0-3
+- Rebuilt for Python 3.8
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.1.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild