[nordugrid-arc/el5: 6/6] 4.2.0 Final Release

Mattias Ellert ellert at fedoraproject.org
Wed Aug 20 09:10:22 UTC 2014 

commit 922f53ec30f180385be1c5caf043d5e92a9103d0
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Wed Aug 20 11:09:13 2014 +0200

    4.2.0 Final Release
    
    - Drop patch nordugrid-arc-twisted.patch
    - Build for EPEL 7 (without xmlsec)

 nordugrid-arc-init.patch    |   46 +++++++++++++++++++++++++++++++++++++++++++
 nordugrid-arc-twisted.patch |   34 -------------------------------
 nordugrid-arc.spec          |   46 ++++++++++++++++++++++++++++++++++--------
 3 files changed, 83 insertions(+), 43 deletions(-)
---
diff --git a/nordugrid-arc-init.patch b/nordugrid-arc-init.patch
new file mode 100644
index 0000000..e4c3911
--- /dev/null
+++ b/nordugrid-arc-init.patch
@@ -0,0 +1,46 @@
+Index: ./src/services/acix/cacheserver/acix-cache
+===================================================================
+--- ./src/services/acix/cacheserver/acix-cache	(revision 29026)
++++ ./src/services/acix/cacheserver/acix-cache	(arbetskopia)
+@@ -1,14 +1,14 @@
+ #!/bin/sh
+ # ARC cache index cache server
+ # 
+-# chkconfig: - 75 25
++# chkconfig: 2345 75 25
+ # description:  The ARC cache server collects cache information which \
+ #               can be pulled by a cache index.
+ 
+ ### BEGIN INIT INFO
+ # Provides:             acix-cache
+-# Required-Start:       $network
+-# Required-Stop:        $network
++# Required-Start:       $network $local_fs
++# Required-Stop:        $network $local_fs
+ # Should-Start:         $time
+ # Should-Stop:          $time
+ # Default-Start:        2 3 4 5
+Index: ./src/services/acix/indexserver/acix-index
+===================================================================
+--- ./src/services/acix/indexserver/acix-index	(revision 29026)
++++ ./src/services/acix/indexserver/acix-index	(arbetskopia)
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # ARC cache index server
+ #
+-# chkconfig: - 75 25
++# chkconfig: 2345 75 25
+ # description:  The ARC cache index server collects cache information from \
+ #               cache servers and can be queried for the locations of cached \
+ #               files.
+@@ -8,8 +8,8 @@
+ 
+ ### BEGIN INIT INFO
+ # Provides:             acix-index
+-# Required-Start:       $network
+-# Required-Stop:        $network
++# Required-Start:       $network $local_fs
++# Required-Stop:        $network $local_fs
+ # Should-Start:         $time
+ # Should-Stop:          $time
+ # Default-Start:        2 3 4 5
diff --git a/nordugrid-arc.spec b/nordugrid-arc.spec
index 16d99fb..abcc278 100644
--- a/nordugrid-arc.spec
+++ b/nordugrid-arc.spec
@@ -89,18 +89,23 @@
 %global with_canl 0
 %endif
 
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:999} <= 6
+%global with_xmlsec1 %{!?_without_xmlsec1:1}%{?_without_xmlsec1:0}
+%else
+%global with_xmlsec1 0
+%endif
+
 %global pkgdir arc
 
 Name:		nordugrid-arc
-Version:	4.1.0
-Release:	5%{?dist}
+Version:	4.2.0
+Release:	1%{?dist}
 Summary:	Advanced Resource Connector Grid Middleware
 Group:		System Environment/Daemons
 License:	ASL 2.0
 URL:		http://www.nordugrid.org/
 Source:		http://download.nordugrid.org/packages/%{name}/releases/%{version}/src/%{name}-%{version}.tar.gz
-#		Backport support for newer python-twisted
-Patch0:		%{name}-twisted.patch
+Patch0:		%{name}-init.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #		Packages dropped without replacements
@@ -135,8 +140,10 @@ BuildRequires:	glib2-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	openssl
 BuildRequires:	openssl-devel
+%if %{with_xmlsec1}
 BuildRequires:	xmlsec1-devel >= 1.2.4
 BuildRequires:	xmlsec1-openssl-devel >= 1.2.4
+%endif
 %if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 4
 BuildRequires:	nss-devel
 %else
@@ -891,6 +898,7 @@ make -C src/hed				DESTDIR=$PWD/docdir/hed	   pkgdatadir= install-profileDATA
 make -C src/doc DESTDIR=$RPM_BUILD_ROOT install-exampleDATA
 
 # Link to arc.conf.reference from doc
+rm -f $PWD/docdir/arc.conf.reference
 ln -s %{_datadir}/%{pkgdir}/examples/arc.conf.reference $PWD/docdir/arc.conf.reference
 
 %clean
@@ -1102,6 +1110,8 @@ service fetch-crl-cron start > /dev/null 2>&1
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc docdir/arc.conf.reference README AUTHORS LICENSE NOTICE ChangeLog
+%dir %{_libdir}/%{pkgdir}
+%dir %{_libexecdir}/%{pkgdir}
 %{_libdir}/libarccompute.so.*
 %{_libdir}/libarccommunication.so.*
 %{_libdir}/libarccommon.so.*
@@ -1110,21 +1120,24 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_libdir}/libarccrypto.so.*
 %{_libdir}/libarcdata.so.*
 %{_libdir}/libarcdatastaging.so.*
-%{_libexecdir}/%{pkgdir}/DataStagingDelivery
+%{_libdir}/%{pkgdir}/DataStagingDelivery
 %{_libdir}/libarcloader.so.*
 %{_libdir}/libarcmessage.so.*
 %{_libdir}/libarcsecurity.so.*
 %{_libdir}/libarcinfosys.so.*
 %{_libdir}/libarcws.so.*
 %{_libdir}/libarcwssecurity.so.*
+%if %{with_xmlsec1}
 %{_libdir}/libarcxmlsec.so.*
+%endif
 # We need to have libmodcrypto.so close to libarccrypto
 %{_libdir}/%{pkgdir}/libmodcrypto.so
 %{_libdir}/%{pkgdir}/libmodcrypto.apd
 # We need to have libmodcredential.so close to libarccredential
 %{_libdir}/%{pkgdir}/libmodcredential.so
 %{_libdir}/%{pkgdir}/libmodcredential.apd
-%{_libexecdir}/%{pkgdir}/arc-file-access
+%{_libdir}/%{pkgdir}/arc-file-access
+%dir %{_datadir}/%{pkgdir}/examples
 %{_datadir}/%{pkgdir}/examples/arc.conf.reference
 %dir %{_datadir}/%{pkgdir}/test-jobs
 %{_datadir}/%{pkgdir}/test-jobs/test-job-*
@@ -1151,11 +1164,14 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_bindir}/arcresub
 %{_bindir}/arcresume
 %{_bindir}/arcrm
+%if %{with_xmlsec1}
 %{_bindir}/arcslcs
+%endif
 %{_bindir}/arcstat
 %{_bindir}/arcsub
 %{_bindir}/arcsync
 %{_bindir}/arctest
+%dir %{_sysconfdir}/%{pkgdir}
 %config(noreplace) %{_sysconfdir}/%{pkgdir}/client.conf
 %doc %{_mandir}/man1/arcacl.1*
 %doc %{_mandir}/man1/arccat.1*
@@ -1174,7 +1190,9 @@ service fetch-crl-cron start > /dev/null 2>&1
 %doc %{_mandir}/man1/arcresub.1*
 %doc %{_mandir}/man1/arcresume.1*
 %doc %{_mandir}/man1/arcrm.1*
+%if %{with_xmlsec1}
 %doc %{_mandir}/man1/arcslcs.1*
+%endif
 %doc %{_mandir}/man1/arcstat.1*
 %doc %{_mandir}/man1/arcsub.1*
 %doc %{_mandir}/man1/arcsync.1*
@@ -1336,6 +1354,7 @@ service fetch-crl-cron start > /dev/null 2>&1
 %dir %{_localstatedir}/spool/arc/urs
 %if %{with_python}
 %{_libexecdir}/%{pkgdir}/ssmsend
+%dir %{_datadir}/%{pkgdir}/ssm
 %{_datadir}/%{pkgdir}/ssm/__init__.py*
 %{_datadir}/%{pkgdir}/ssm/crypto.py*
 %{_datadir}/%{pkgdir}/ssm/ssm2.py*
@@ -1346,6 +1365,7 @@ service fetch-crl-cron start > /dev/null 2>&1
 %if %{with_acix}
 %files acix-core
 %defattr(-,root,root,-)
+%dir %{python_sitelib}/acix
 %{python_sitelib}/acix/__init__.py*
 %{python_sitelib}/acix/core
 
@@ -1373,6 +1393,9 @@ service fetch-crl-cron start > /dev/null 2>&1
 
 %files plugins-needed
 %defattr(-,root,root,-)
+%dir %{_libdir}/%{pkgdir}/test
+%{_libdir}/%{pkgdir}/test/libaccTEST.so
+%{_libdir}/%{pkgdir}/test/libaccTEST.apd
 %{_libdir}/%{pkgdir}/libaccARC1.so
 %{_libdir}/%{pkgdir}/libaccBroker.so
 %{_libdir}/%{pkgdir}/libaccCREAM.so
@@ -1380,7 +1403,6 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_libdir}/%{pkgdir}/libaccJobDescriptionParser.so
 %{_libdir}/%{pkgdir}/libaccSER.so
 %{_libdir}/%{pkgdir}/libaccldap.so
-%{_libdir}/%{pkgdir}/test/libaccTEST.so
 %{_libdir}/%{pkgdir}/libarcshc.so
 %{_libdir}/%{pkgdir}/libarcshclegacy.so
 %{_libdir}/%{pkgdir}/libdmcfile.so
@@ -1404,7 +1426,6 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_libdir}/%{pkgdir}/libaccJobDescriptionParser.apd
 %{_libdir}/%{pkgdir}/libaccSER.apd
 %{_libdir}/%{pkgdir}/libaccldap.apd
-%{_libdir}/%{pkgdir}/test/libaccTEST.apd
 %{_libdir}/%{pkgdir}/libarcshc.apd
 %{_libdir}/%{pkgdir}/libarcshclegacy.apd
 %{_libdir}/%{pkgdir}/libdmcfile.apd
@@ -1512,13 +1533,20 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_bindir}/arcemiestest
 %{_bindir}/arcwsrf
 %{_bindir}/arcperftest
+%if %{with_xmlsec1}
 %{_bindir}/saml_assertion_init
+%doc %{_mandir}/man1/saml_assertion_init.1*
+%endif
 %doc %{_mandir}/man1/arcemiestest.1*
 %doc %{_mandir}/man1/arcwsrf.1*
 %doc %{_mandir}/man1/arcperftest.1*
-%doc %{_mandir}/man1/saml_assertion_init.1*
 
 %changelog
+* Mon Aug 18 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.2.0-1
+- 4.2.0 Final Release
+- Drop patch nordugrid-arc-twisted.patch
+- Build for EPEL 7 (without xmlsec)
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

More information about the scm-commits mailing list