[nordugrid-arc/el5: 2/2] 1.1.0 Final Release Drop patches accepted upstream: nordugrid-arc-perl-switch.patch and nordugrid-ar

Mattias Ellert ellert at fedoraproject.org
Wed Oct 19 07:36:08 UTC 2011


commit 6ac66f139812a87f9fde0b71f987ccecf1c267fd
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Wed Oct 19 09:34:29 2011 +0200

    1.1.0 Final Release
    Drop patches accepted upstream: nordugrid-arc-perl-switch.patch and
    nordugrid-arc-run-full.patch

 nordugrid-arc-perl-switch.patch |  207 -----------------------
 nordugrid-arc-run-full.patch    |  351 ---------------------------------------
 nordugrid-arc.spec              |   72 +++++++--
 sources                         |    2 +-
 4 files changed, 58 insertions(+), 574 deletions(-)
---
diff --git a/nordugrid-arc.spec b/nordugrid-arc.spec
index 1be57be..0bb1984 100644
--- a/nordugrid-arc.spec
+++ b/nordugrid-arc.spec
@@ -46,17 +46,13 @@
 %global pkgdir arc
 
 Name:		nordugrid-arc
-Version:	1.0.1
-Release:	3%{?dist}.1
+Version:	1.1.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
-#		Remove perl switch statements - Upstream svn revision 22410
-Patch0:		%{name}-perl-switch.patch
-#		Move large files away from /var/run in order not to fill /run
-Patch1:		%{name}-run-full.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cppunit-devel
@@ -259,6 +255,25 @@ This package contains the ARC cache service. It provides a way to perform
 some operations on the A-REX cache remotely. It can be especially helpful
 for data management within a pilot job framework.
 
+%package datadelivery-service
+Summary:	ARC data delivery service
+Group:		System Environment/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-hed = %{version}-%{release}
+Requires:	%{name}-plugins-needed = %{version}-%{release}
+
+Requires(post):		chkconfig
+Requires(preun):	chkconfig
+Requires(preun):	initscripts
+Requires(postun):	initscripts
+
+%description datadelivery-service
+NorduGrid is a collaboration aiming at development, maintenance and
+support of the free Grid middleware, known as the Advanced Resource
+Connector (ARC).
+
+This package contains the ARC data delivery service.
+
 %package aris
 Summary:	ARC LDAP information service
 Group:		System Environment/Libraries
@@ -316,6 +331,9 @@ to.
 Summary:	ARC LDAP monitor service
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	php
+Requires:	php-gd
+Requires:	php-ldap
 %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
 BuildArch:	noarch
 %endif
@@ -548,8 +566,6 @@ fetch-crl tool in the fetch-crl package.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
 
 %if %{?fedora}%{!?fedora:0} <= 9 && %{?rhel}%{!?rhel:0} <= 5
 # Older versions of SELinux does not have policy for open
@@ -575,6 +591,7 @@ cd -
 %if %{?fedora}%{!?fedora:0} >= 13
      --with-altpython=python3 \
 %endif
+     --disable-xrootd \
      --disable-doc \
      --with-docdir=%{_docdir}/%{name}-%{version}
 
@@ -690,17 +707,31 @@ if [ $1 -ge 1 ]; then
 fi
 
 %post cache-service
-/sbin/chkconfig --add cache-service
+/sbin/chkconfig --add arc-cache-service
 
 %preun cache-service
 if [ $1 -eq 0 ]; then
-  service cache-service stop > /dev/null 2>&1
-  /sbin/chkconfig --del cache-service
+  service arc-cache-service stop > /dev/null 2>&1
+  /sbin/chkconfig --del arc-cache-service
 fi
 
 %postun cache-service
 if [ $1 -ge 1 ]; then
-  service cache-service condrestart > /dev/null 2>&1
+  service arc-cache-service condrestart > /dev/null 2>&1
+fi
+
+%post datadelivery-service
+/sbin/chkconfig --add arc-datadelivery-service
+
+%preun datadelivery-service
+if [ $1 -eq 0 ]; then
+  service arc-datadelivery-service stop > /dev/null 2>&1
+  /sbin/chkconfig --del arc-datadelivery-service
+fi
+
+%postun datadelivery-service
+if [ $1 -ge 1 ]; then
+  service arc-datadelivery-service condrestart > /dev/null 2>&1
 fi
 
 %post aris
@@ -909,8 +940,6 @@ service fetch-crl-cron start > /dev/null 2>&1
 %files aris
 %defattr(-,root,root,-)
 %{_initrddir}/grid-infosys
-%{_datadir}/%{pkgdir}/grid-infosys-bdii4
-%{_datadir}/%{pkgdir}/grid-infosys-bdii5
 %{_datadir}/%{pkgdir}/glue-generator.pl
 %{_datadir}/%{pkgdir}/glite-info-provider-ldap
 %{_datadir}/%{pkgdir}/ldap-schema
@@ -948,10 +977,16 @@ service fetch-crl-cron start > /dev/null 2>&1
 
 %files cache-service
 %defattr(-,root,root,-)
-%{_initrddir}/cache-service
+%{_initrddir}/arc-cache-service
 %{_libdir}/%{pkgdir}/libcacheservice.so
 %{_libdir}/%{pkgdir}/libcacheservice.apd
 
+%files datadelivery-service
+%defattr(-,root,root,-)
+%{_initrddir}/arc-datadelivery-service
+%{_libdir}/%{pkgdir}/libdatadeliveryservice.so
+%{_libdir}/%{pkgdir}/libdatadeliveryservice.apd
+
 %files arex
 %defattr(-,root,root,-)
 %{_initrddir}/a-rex
@@ -1034,6 +1069,7 @@ service fetch-crl-cron start > /dev/null 2>&1
 %files plugins-needed
 %defattr(-,root,root,-)
 %{_libdir}/%{pkgdir}/libaccARC1.so
+%{_libdir}/%{pkgdir}/libaccEMIREG.so
 %{_libdir}/%{pkgdir}/libaccCREAM.so
 %{_libdir}/%{pkgdir}/libaccBroker.so
 %{_libdir}/%{pkgdir}/libaccJobDescriptionParser.so
@@ -1051,6 +1087,7 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_libdir}/%{pkgdir}/libmcctcp.so
 %{_libdir}/%{pkgdir}/libmcctls.so
 %{_libdir}/%{pkgdir}/libaccARC1.apd
+%{_libdir}/%{pkgdir}/libaccEMIREG.apd
 %{_libdir}/%{pkgdir}/libaccCREAM.apd
 %{_libdir}/%{pkgdir}/libaccBroker.apd
 %{_libdir}/%{pkgdir}/libaccJobDescriptionParser.apd
@@ -1155,6 +1192,11 @@ service fetch-crl-cron start > /dev/null 2>&1
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Oct 03 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.1.0-1
+- 1.1.0 Final Release
+- Drop patches accepted upstream: nordugrid-arc-perl-switch.patch and
+  nordugrid-arc-run-full.patch
+
 * Mon Oct 03 2011 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-3.1
 - rebuild (java), rel-eng#4932
 
diff --git a/sources b/sources
index 91f95f2..fa73d7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-801b6c4077d77b8cee1dd9641e95de1d  nordugrid-arc-1.0.1.tar.gz
+8cd85fa4294920eda7bc8ef71c56587c  nordugrid-arc-1.1.0.tar.gz


More information about the scm-commits mailing list