[nordugrid-arc/el5] 3.0.0 Final Release

Mattias Ellert ellert at fedoraproject.org
Tue Apr 16 12:32:04 UTC 2013


commit 6bc4c23bd25d1913bf9e3bdc89cd3d0b2944e7b3
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Apr 16 14:31:36 2013 +0200

    3.0.0 Final Release
    
    - Drop obsolete patches nordugrid-arc-swig-209.patch and
      nordugrid-arc-xrootd-private.patch

 nordugrid-arc-swig-209.patch       |   22 --
 nordugrid-arc-xrootd-private.patch |   38 ---
 nordugrid-arc.spec                 |  468 ++++++++++++++++++++++++++++--------
 sources                            |    2 +-
 4 files changed, 374 insertions(+), 156 deletions(-)
---
diff --git a/nordugrid-arc.spec b/nordugrid-arc.spec
index 79458eb..8a22687 100644
--- a/nordugrid-arc.spec
+++ b/nordugrid-arc.spec
@@ -21,19 +21,24 @@
 %endif
 
 %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0}
-%global with_xrootd  %{!?_without_xrootd:1}%{?_without_xrootd:0}
+%global with_xrootd %{!?_without_xrootd:1}%{?_without_xrootd:0}
 %else
-%global with_xrootd  0
+%global with_xrootd 0
 %endif
 
-%global with_lfc  %{!?_without_lfc:1}%{?_without_lfc:0}
+%global with_lfc %{!?_without_lfc:1}%{?_without_lfc:0}
 
 %if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
 %global with_java %{!?_without_java:1}%{?_without_java:0}
+%if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
+%global with_junit %{!?_without_junit:1}%{?_without_junit:0}
+%else
+%global with_junit 0
+%endif
 %else
 %global with_java 0
 %endif
-%global with_gcj  %{!?_with_gcj:0}%{?_with_gcj:1}
+%global with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
 
 %if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
 %if %{?rhel}%{!?rhel:0} == 6
@@ -50,18 +55,34 @@
 %global with_python 0
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 5
+%global with_acix 1
+%else
+%global with_acix 0
+%endif
+
+%if %{?fedora}%{!?fedora:0} >= 16 || %{?rhel}%{!?rhel:0} >= 5
+%global with_gfal 1
+%else
+%global with_gfal 0
+%endif
+
+%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 5
+%global with_canl %{!?_with_canl:0}%{?_with_canl:1}
+%else
+%global with_canl 0
+%endif
+
 %global pkgdir arc
 
 Name:		nordugrid-arc
-Version:	2.0.1
-Release:	4%{?dist}
+Version:	3.0.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
-Patch0:		%{name}-swig-209.patch
-Patch1:		%{name}-xrootd-private.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #		Packages dropped without replacements
@@ -94,23 +115,32 @@ BuildRequires:	openssl
 BuildRequires:	openssl-devel
 BuildRequires:	xmlsec1-devel >= 1.2.4
 BuildRequires:	xmlsec1-openssl-devel >= 1.2.4
+%if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 4
+BuildRequires:	nss-devel
+%else
+BuildRequires:	mozilla-nss-devel
+%endif
 BuildRequires:	openldap-devel
 BuildRequires:	globus-common-devel
 BuildRequires:	globus-ftp-client-devel
 BuildRequires:	globus-ftp-control-devel
-BuildRequires:	globus-rls-client-devel
 %if %{with_lfc}
 BuildRequires:	lfc-devel
 %endif
 BuildRequires:	gridsite-devel
+%if %{with_canl}
+BuildRequires:	canl-c++-devel
+%endif
 %if %{with_xrootd}
 %if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 5
 BuildRequires:	xrootd-client-devel
-BuildRequires:	xrootd-private-devel
 %else
 BuildRequires:	xrootd-devel
 %endif
 %endif
+%if %{with_gfal}
+BuildRequires:	gfal2-devel
+%endif
 %if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 7
 BuildRequires:	libdb-cxx-devel
 %else
@@ -126,11 +156,23 @@ BuildRequires:	jpackage-utils
 %if %{with_gcj}
 BuildRequires:	java-gcj-compat-devel
 %endif
+%if %{with_junit}
+BuildRequires:	junit
+%endif
 %endif
 # Needed for LRMS testing during make check
 BuildRequires:	perl(Test::Harness)
 BuildRequires:	perl(Test::Simple)
 BuildRequires:	mktemp
+# Needed to run ACIX unit tests
+%if %{with_acix}
+BuildRequires:	python-twisted-core
+BuildRequires:	python-twisted-web
+BuildRequires:	pyOpenSSL
+%if %{?rhel}%{!?rhel:0} == 5
+BuildRequires:	python-hashlib
+%endif
+%endif
 %if %{?fedora}%{!?fedora:0} >= 6 || %{?rhel}%{!?rhel:0} >= 5
 # The compilation of the selinux module fails on Fedora 5
 BuildRequires:	selinux-policy-devel
@@ -256,14 +298,15 @@ Connector (ARC).
 
 This package contains the ARC data delivery service.
 
-%package aris
+%package ldap-infosys
 Summary:	ARC LDAP information service
 Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	bdii
 %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
 BuildArch:	noarch
 %endif
+Requires:	openldap-servers
+Requires:	glue-schema >= 2.0.10
+Requires:	bdii
 
 Requires(post):		chkconfig
 Requires(preun):	chkconfig
@@ -279,7 +322,7 @@ Requires(postun):	policycoreutils-python
 %endif
 %endif
 
-%description aris
+%description ldap-infosys
 NorduGrid is a collaboration aiming at development, maintenance and
 support of the free Grid middleware, known as the Advanced Resource
 Connector (ARC).
@@ -289,11 +332,38 @@ This package is not self-contained. it should be pulled in by either
 nordugrid-arc-arex to be a part of a local information system or by
 nordugrid-arc-egiis to be a part of a EGIIS service.
 
+%package aris
+Summary:	ARC local information system
+Group:		System Environment/Libraries
+Requires:	%{name}-ldap-infosys = %{version}-%{release}
+Requires:	bdii
+%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
+BuildArch:	noarch
+%endif
+Requires:	openldap-servers
+Requires:	glue-schema >= 2.0.10
+Requires:	bdii
+
+Requires(post):		chkconfig
+Requires(preun):	chkconfig
+Requires(preun):	initscripts
+Requires(postun):	initscripts
+
+%description aris
+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 LDAP based information system for ARC.
+This package is not self-contained but is closely connected to
+nordugrid-arc-arex.
+
 %package egiis
 Summary:	ARC EGIIS service
 Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-aris = %{version}-%{release}
+Requires:	%{name}-ldap-infosys = %{version}-%{release}
+Requires:	openldap-servers
+Requires:	glue-schema >= 2.0.10
 
 %if %{?fedora}%{!?fedora:0} >= 6 || %{?rhel}%{!?rhel:0} >= 5
 Requires(post):		policycoreutils
@@ -352,11 +422,13 @@ Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-hed = %{version}-%{release}
 Requires:	%{name}-plugins-needed = %{version}-%{release}
+Requires:	%{name}-python = %{version}-%{release}
 Requires:	mktemp
 Requires:	python-twisted-core
 Requires:	python-twisted-web
 Requires:	stomppy
-Requires:	m2crypto
+Requires:	python-ldap
+Requires:	python-dirq
 Requires:	%{name}-aris = %{version}-%{release}
 
 Requires(post):		chkconfig
@@ -398,6 +470,111 @@ Connector (ARC).
 ARC Globus plugins. This includes the Globus dependent Data Manager
 Components (DMCs).
 
+%if %{with_canl}
+%package arcproxyalt
+Summary:	ARC proxy client based on canl
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+
+%description arcproxyalt
+NorduGrid is a collaboration aiming at development, maintenance and
+support of the free Grid middleware, known as the Advanced Resource
+Connector (ARC).
+
+This package includes a preview of the arcproxy command based on canl.
+%endif
+
+%if %{with_xrootd}
+%package plugins-xrootd
+Summary:	ARC xrootd plugins
+Group:		System Environment/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugins-xrootd
+NorduGrid is a collaboration aiming at development, maintenance and
+support of the free Grid middleware, known as the Advanced Resource
+Connector (ARC).
+
+ARC xrootd plugins. These allow access to data through the xrootd protocol.
+%endif
+
+%if %{with_gfal}
+%package plugins-gfal
+
+Summary:	ARC Globus plugins
+Group:		System Environment/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugins-gfal
+NorduGrid is a collaboration aiming at development, maintenance and
+support of the free Grid middleware, known as the Advanced Resource
+Connector (ARC).
+
+ARC plugins for GFAL2. This allows third-party transfer and adds support
+for several extra transfer protocols (rfio, dcap, gsidcap). Specific
+protocol support is provided by separate gfal2-plugin packages.
+%endif
+
+%if %{with_acix}
+%package acix-core
+Summary:	ARC cache index - core
+Group:		System Environment/Libraries
+Requires:	python-twisted-core
+Requires:	python-twisted-web
+Requires:	pyOpenSSL
+%if %{?rhel}%{!?rhel:0} == 5
+Requires:	python-hashlib
+%endif
+
+%description acix-core
+NorduGrid is a collaboration aiming at development, maintenance and
+support of the free Grid middleware, known as the Advanced Resource
+Connector (ARC).
+
+Core components of the ARC Cache Index (ACIX).
+
+%package acix-cache
+Summary:	ARC cache index - cache server
+Group:		System Environment/Libraries
+Requires:	python-twisted-core
+Requires:	python-twisted-web
+Requires:	pyOpenSSL
+%if %{?rhel}%{!?rhel:0} == 5
+Requires:	python-hashlib
+%endif
+Requires:	%{name}-acix-core = %{version}-%{release}
+
+%description acix-cache
+NorduGrid is a collaboration aiming at development, maintenance and
+support of the free Grid middleware, known as the Advanced Resource
+Connector (ARC).
+
+Cache server component of the ARC Cache Index (ACIX), usually installed
+alongside A-REX. This component collects information on the content of
+an A-REX cache.
+
+%package acix-index
+Summary:	ARC cache index - index server
+Group:		System Environment/Libraries
+Requires:	python-twisted-core
+Requires:	python-twisted-web
+Requires:	pyOpenSSL
+%if %{?rhel}%{!?rhel:0} == 5
+Requires:	python-hashlib
+%endif
+Requires:	%{name}-acix-core = %{version}-%{release}
+
+%description acix-index
+NorduGrid is a collaboration aiming at development, maintenance and
+support of the free Grid middleware, known as the Advanced Resource
+Connector (ARC).
+
+Index server component of the ARC Cache Index (ACIX), usually installed
+independently of any A-REX installation. This component pulls cache content
+from cache servers and can be queried by clients for the location of cached
+files.
+%endif
+
 %package devel
 Summary:	ARC development files
 Group:		Development/Libraries
@@ -495,6 +672,8 @@ Reference to the ARC programming API. It is prepared with doxygen.
 Summary:	NorduGrid authorization tools
 Group:		Applications/Internet
 Requires:	perl(Crypt::SSLeay)
+Requires:	perl(SOAP::Lite)
+Requires:	perl(Crypt::OpenSSL::X509)
 %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
 BuildArch:	noarch
 %endif
@@ -527,10 +706,23 @@ The nordugrid-arc-ca-utils packages has been obsoleted.
 The functionality of the grid-update-crls tool is provided by the
 fetch-crl tool in the fetch-crl package.
 
+%package misc-utils
+Summary:	NorduGrid misc tools
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-plugins-needed = %{version}-%{release}
+
+%description misc-utils
+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 various for various tasks including testing. The
+package is usually not required by users or sysadmins but mainly for
+developers.
+
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %if %{?fedora}%{!?fedora:0} <= 9 && %{?rhel}%{!?rhel:0} <= 5
 # Older versions of SELinux does not have policy for open
@@ -550,19 +742,25 @@ cd -
 %if ! %{with_python}
      --disable-python \
 %endif
+%if ! %{with_acix}
+     --disable-acix \
+%endif
+%if %{with_gfal}
+     --enable-gfal \
+%endif
 %if %{?rhel}%{!?rhel:0} == 5
      --with-altpython=python26 \
 %endif
 %if %{?fedora}%{!?fedora:0} >= 13
      --with-altpython=python3 \
 %endif
+%if %{with_canl}
+     --enable-canlxx \
+%endif
 %if ! %{with_xrootd}
      --disable-xrootd \
 %endif
-     --disable-storage-service \
-     --disable-hopi-service \
-     --disable-isis-service \
-     --disable-janitor-service \
+     --disable-dbjstore \
      --disable-doc \
      --with-docdir=%{_docdir}/%{name}-%{version}
 
@@ -600,7 +798,7 @@ find $RPM_BUILD_ROOT -name libarcglobusutils.so -exec rm -fv '{}' ';'
 
 # Turn off default enabling of the services
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-sed -e 's/\(chkconfig: \)\w*/\1-/' \
+sed -e 's/\(chkconfig: \) *[^ ]*/\1-/' \
     -e '/Default-Start/d' \
     -e 's/\(Default-Stop:\s*\).*/\10 1 2 3 4 5 6/' \
     -i $RPM_BUILD_ROOT%{_initrddir}/*
@@ -710,55 +908,62 @@ if [ $1 -ge 1 ]; then
   service arc-datadelivery-service condrestart > /dev/null 2>&1
 fi
 
-%post aris
-/sbin/chkconfig --add grid-infosys
+%post ldap-infosys
+/sbin/chkconfig --add nordugrid-arc-slapd
+/sbin/chkconfig --add nordugrid-arc-inforeg
 %if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
 semanage port -a -t ldap_port_t -p tcp 2135 2>/dev/null || :
-semanage fcontext -a -t slapd_etc_t "/var/run/arc/bdii/bdii-slapd\.conf" 2>/dev/null || :
+semanage fcontext -a -t slapd_etc_t "/var/run/arc/infosys/bdii-slapd\.conf" 2>/dev/null || :
+%endif
+
+%preun ldap-infosys
+if [ $1 -eq 0 ]; then
+  service nordugrid-arc-slapd stop > /dev/null 2>&1
+  service nordugrid-arc-inforeg stop > /dev/null 2>&1
+  /sbin/chkconfig --del nordugrid-arc-slapd
+  /sbin/chkconfig --del nordugrid-arc-inforeg
+fi
+
+%postun ldap-infosys
+if [ $1 -ge 1 ]; then
+  service nordugrid-arc-slapd condrestart > /dev/null 2>&1
+  service nordugrid-arc-inforeg condrestart > /dev/null 2>&1
+fi
+%if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
+if [ $1 -eq 0 ]; then
+  semanage port -d -t ldap_port_t -p tcp 2135 2>/dev/null || :
+  semanage fcontext -d -t slapd_etc_t "/var/run/arc/infosys/bdii-slapd\.conf" 2>/dev/null || :
+fi
+%endif
+
+%post aris
+/sbin/chkconfig --add nordugrid-arc-bdii
+%if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
 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 || :
 # Remove selinux labels for old arc bdii var dir
 semanage fcontext -d -t slapd_db_t "/var/run/arc/bdii(/.*)?" 2>/dev/null || :
 %endif
-# Move files to new locations so that the condrestart in postun works
-if [ -r /var/lock/subsys/grid-infosys ] && \
-   [ ! -r /var/lock/subsys/arc-bdii-update ] ; then
-   [ -r /var/lock/subsys/bdii-update ] && \
-   mv /var/lock/subsys/bdii-update /var/lock/subsys/arc-bdii-update
-   [ -r /var/lock/subsys/bdii-slapd ] && \
-   mv /var/lock/subsys/bdii-slapd /var/lock/subsys/arc-bdii-slapd
-   [ -d /var/run/bdii ] && [ ! -d /var/run/arc/bdii ] && \
-   mkdir -p /var/run/arc && mv /var/run/bdii /var/run/arc/bdii || :
-   [ -d /var/tmp/bdii ] && [ ! -d /var/tmp/arc/bdii ] && \
-   mkdir -p /var/tmp/arc && mv /var/tmp/bdii /var/tmp/arc/bdii || :
-   [ -d /var/log/bdii ] && [ ! -d /var/log/arc/bdii ] && \
-   mkdir -p /var/log/arc && mv /var/log/bdii /var/log/arc/bdii || :
-   [ -r /var/run/bdii-update.pid ] && \
-   mkdir -p /var/run/arc/bdii && \
-   mv /var/run/bdii-update.pid /var/run/arc/bdii/bdii-update.pid || :
-fi
 
 %preun aris
 if [ $1 -eq 0 ]; then
-  service grid-infosys stop > /dev/null 2>&1
-  /sbin/chkconfig --del grid-infosys
+  service nordugrid-arc-bdii stop > /dev/null 2>&1 || :
+  /sbin/chkconfig --del nordugrid-arc-bdii
 fi
 
 %postun aris
 if [ $1 -ge 1 ]; then
-  service grid-infosys condrestart > /dev/null 2>&1
+  service nordugrid-arc-bdii condrestart > /dev/null 2>&1 || :
 fi
 %if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
 if [ $1 -eq 0 ]; then
-  semanage port -d -t ldap_port_t -p tcp 2135 2>/dev/null || :
-  semanage fcontext -d -t slapd_etc_t "/var/run/arc/bdii/bdii-slapd\.conf" 2>/dev/null || :
   semanage fcontext -d -t slapd_db_t "/var/lib/arc/bdii/db(/.*)?" 2>/dev/null || :
   semanage fcontext -d -t slapd_var_run_t "/var/run/arc/bdii/db(/.*)?" 2>/dev/null || :
 fi
 %endif
 
 %triggerun aris -- bdii
-service grid-infosys condrestart > /dev/null 2>&1
+service nordugrid-arc-bdii condrestart > /dev/null 2>&1 || :
 
 %post egiis
 %if %{?fedora}%{!?fedora:0} >= 6 || %{?rhel}%{!?rhel:0} >= 5
@@ -773,6 +978,36 @@ if [ $1 -eq 0 ] ; then
 fi
 %endif
 
+%if %{with_acix}
+%post acix-cache
+/sbin/chkconfig --add acix-cache
+
+%preun acix-cache
+if [ $1 -eq 0 ]; then
+  service acix-cache stop > /dev/null 2>&1
+  /sbin/chkconfig --del acix-cache
+fi
+
+%postun acix-cache
+if [ $1 -ge 1 ]; then
+  service acix-cache condrestart > /dev/null 2>&1 || :
+fi
+
+%post acix-index
+/sbin/chkconfig --add acix-index
+
+%preun acix-index
+if [ $1 -eq 0 ]; then
+  service acix-index stop > /dev/null 2>&1 || :
+  /sbin/chkconfig --del acix-index
+fi
+
+%postun acix-index
+if [ $1 -ge 1 ]; then
+  service acix-index condrestart > /dev/null 2>&1 || :
+fi
+%endif
+
 %if %{with_java} && %{with_gcj}
 %post java
 [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
@@ -790,18 +1025,20 @@ service fetch-crl-cron start > /dev/null 2>&1
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_libdir}/libarcclient.so.*
+%{_libdir}/libarccompute.so.*
+%{_libdir}/libarccommunication.so.*
 %{_libdir}/libarccommon.so.*
 %{_libdir}/libarccredential.so.*
 %{_libdir}/libarccredentialstore.so.*
 %{_libdir}/libarccrypto.so.*
-%{_libdir}/libarcdata2.so.*
+%{_libdir}/libarcdata.so.*
 %{_libdir}/libarcdatastaging.so.*
 %{_libexecdir}/%{pkgdir}/DataStagingDelivery
 %{_libdir}/libarcdbxml.so.*
 %{_libdir}/libarcloader.so.*
 %{_libdir}/libarcmessage.so.*
 %{_libdir}/libarcsecurity.so.*
+%{_libdir}/libarcinfosys.so.*
 %{_libdir}/libarcws.so.*
 %{_libdir}/libarcwssecurity.so.*
 %{_libdir}/libarcxmlsec.so.*
@@ -812,8 +1049,6 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_libdir}/%{pkgdir}/libmodcredential.so
 %{_libdir}/%{pkgdir}/libmodcredential.apd
 %{_libexecdir}/%{pkgdir}/arc-file-access
-%{_bindir}/ngconfigtest
-%doc %{_mandir}/man1/ngconfigtest.1*
 %dir %{_datadir}/%{pkgdir}/examples
 %doc %{_datadir}/%{pkgdir}/examples/arc.conf.template
 %doc %{_datadir}/%{pkgdir}/examples/arc.conf.reference
@@ -821,7 +1056,7 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_datadir}/%{pkgdir}/test-jobs/test-job-*
 %{_datadir}/%{pkgdir}/schema
 %dir %{_datadir}/%{pkgdir}
-%doc README AUTHORS LICENSE
+%doc README AUTHORS LICENSE ChangeLog
 
 %files client
 %defattr(-,root,root,-)
@@ -836,21 +1071,17 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_bindir}/arcls
 %{_bindir}/arcmigrate
 %{_bindir}/arcmkdir
+%{_bindir}/arcrename
 %{_bindir}/arcproxy
 %{_bindir}/arcrenew
 %{_bindir}/arcresub
 %{_bindir}/arcresume
 %{_bindir}/arcrm
 %{_bindir}/arcslcs
-%{_bindir}/arcsrmping
 %{_bindir}/arcstat
 %{_bindir}/arcsub
 %{_bindir}/arcsync
 %{_bindir}/arctest
-%{_bindir}/arcwsrf
-%{_bindir}/isistest
-%{_bindir}/perftest
-%{_bindir}/saml_assertion_init
 %{_bindir}/ngclient2arc
 %config(noreplace) %{_sysconfdir}/%{pkgdir}/client.conf
 %doc %{_datadir}/%{pkgdir}/examples/client.conf
@@ -865,6 +1096,7 @@ service fetch-crl-cron start > /dev/null 2>&1
 %doc %{_mandir}/man1/arcls.1*
 %doc %{_mandir}/man1/arcmigrate.1*
 %doc %{_mandir}/man1/arcmkdir.1*
+%doc %{_mandir}/man1/arcrename.1*
 %doc %{_mandir}/man1/arcproxy.1*
 %doc %{_mandir}/man1/arcrenew.1*
 %doc %{_mandir}/man1/arcresub.1*
@@ -872,14 +1104,9 @@ service fetch-crl-cron start > /dev/null 2>&1
 %doc %{_mandir}/man1/arcrm.1*
 %doc %{_mandir}/man1/arcslcs.1*
 %doc %{_mandir}/man1/arcstat.1*
-%doc %{_mandir}/man1/arcsrmping.1*
 %doc %{_mandir}/man1/arcsub.1*
 %doc %{_mandir}/man1/arcsync.1*
 %doc %{_mandir}/man1/arctest.1*
-%doc %{_mandir}/man1/arcwsrf.1*
-%doc %{_mandir}/man1/isistest.1*
-%doc %{_mandir}/man1/perftest.1.gz
-%doc %{_mandir}/man1/saml_assertion_init.1*
 %doc %{_mandir}/man1/ngclient2arc.1*
 
 %files hed
@@ -904,24 +1131,33 @@ service fetch-crl-cron start > /dev/null 2>&1
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-gridftpd
 %doc %{_mandir}/man8/gridftpd.8*
 
+%files ldap-infosys
+%defattr(-,root,root,-)
+%{_initrddir}/nordugrid-arc-slapd
+%{_initrddir}/nordugrid-arc-inforeg
+%{_datadir}/%{pkgdir}/create-slapd-config
+%{_datadir}/%{pkgdir}/create-inforeg-config
+%{_datadir}/%{pkgdir}/config_parser_compat.sh
+%{_datadir}/%{pkgdir}/grid-info-soft-register
+%{_datadir}/%{pkgdir}/ldap-schema
+
 %files aris
 %defattr(-,root,root,-)
-%{_initrddir}/grid-infosys
+%{_initrddir}/nordugrid-arc-bdii
+%{_datadir}/%{pkgdir}/create-bdii-config
 %{_datadir}/%{pkgdir}/glue-generator.pl
 %{_datadir}/%{pkgdir}/glite-info-provider-ldap
-%{_datadir}/%{pkgdir}/ldap-schema
-%{_datadir}/%{pkgdir}/grid-info-soft-register
 %{_datadir}/%{pkgdir}/qju.pl
 %{_datadir}/%{pkgdir}/cluster.pl
 %{_datadir}/%{pkgdir}/se.pl
 %{_datadir}/%{pkgdir}/LRMS.pm
 %{_datadir}/%{pkgdir}/Shared.pm
 %{_datadir}/%{pkgdir}/ConfigParser.pm
-%{_datadir}/%{pkgdir}/config_parser_compat.sh
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-aris
 
 %files egiis
 %defattr(-,root,root,-)
+%{_initrddir}/nordugrid-arc-egiis
 %{_sbindir}/arc-infoindex-relay
 %{_sbindir}/arc-infoindex-server
 %{_mandir}/man8/arc-infoindex-relay.8*
@@ -971,10 +1207,10 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_libexecdir}/%{pkgdir}/arc-vomsac-check
 %{_libexecdir}/%{pkgdir}/arc-ur-logger
 %{_libexecdir}/%{pkgdir}/arc-ur-registrant
+%{_libexecdir}/%{pkgdir}/arc-config-check
 %{_datadir}/%{pkgdir}/cancel-*-job
 %{_datadir}/%{pkgdir}/scan-*-job
 %{_datadir}/%{pkgdir}/submit-*-job
-%{_datadir}/%{pkgdir}/finish-condor-job
 %{_datadir}/%{pkgdir}/DGAuthplug.py*
 %{_datadir}/%{pkgdir}/DGBridgeDataPlugin.py*
 %{_datadir}/%{pkgdir}/DGLog2XML.py*
@@ -990,8 +1226,8 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_datadir}/%{pkgdir}/LSF.pm
 %{_datadir}/%{pkgdir}/PBS.pm
 %{_datadir}/%{pkgdir}/Condor.pm
+%{_datadir}/%{pkgdir}/SLURMmod.pm
 %{_datadir}/%{pkgdir}/SLURM.pm
-%{_datadir}/%{pkgdir}/GridFactory.pm
 %{_datadir}/%{pkgdir}/DGBridge.pm
 %{_datadir}/%{pkgdir}/XmlPrinter.pm
 %{_datadir}/%{pkgdir}/InfosysHelper.pm
@@ -1019,17 +1255,36 @@ service fetch-crl-cron start > /dev/null 2>&1
 %doc %{_mandir}/man1/cache-clean.1*
 %doc %{_mandir}/man1/cache-list.1*
 %doc %{_mandir}/man1/jura.1*
+%doc %{_mandir}/man8/gm-jobs.8*
+%doc %{_mandir}/man1/arc-config-check.1*
 %doc %{_mandir}/man8/arc-vomsac-check.8*
 %doc %{_datadir}/%{pkgdir}/examples/a-rex
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-arex
 %dir %{_localstatedir}/log/arc
 %if %{with_python}
-%{_libexecdir}/%{pkgdir}/ssm_master
-%{_datadir}/%{pkgdir}/ssm/encrypt_utils.py*
-%{_datadir}/%{pkgdir}/ssm/ssm.py*
-%{_datadir}/%{pkgdir}/ssm/message_db.py*
-%{_datadir}/%{pkgdir}/ssm/ssm.cfg
-%{_datadir}/%{pkgdir}/ssm/ssm.log.cfg
+%{_libexecdir}/%{pkgdir}/ssmsend
+%{_datadir}/%{pkgdir}/ssm/__init__.py*
+%{_datadir}/%{pkgdir}/ssm/crypto.py*
+%{_datadir}/%{pkgdir}/ssm/ssm2.py*
+%{_datadir}/%{pkgdir}/ssm/brokers.py*
+%{_datadir}/%{pkgdir}/ssm/sender.cfg
+%endif
+
+%if %{with_acix}
+%files acix-core
+%defattr(-,root,root,-)
+%{python_sitelib}/acix/__init__.py*
+%{python_sitelib}/acix/core
+
+%files acix-cache
+%defattr(-,root,root,-)
+%{python_sitelib}/acix/cacheserver
+%{_initrddir}/acix-cache
+
+%files acix-index
+%defattr(-,root,root,-)
+%{python_sitelib}/acix/indexserver
+%{_initrddir}/acix-index
 %endif
 
 %files devel
@@ -1061,6 +1316,7 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_libdir}/%{pkgdir}/libdmcldap.so
 %{_libdir}/%{pkgdir}/libdmcsrm.so
 %{_libdir}/%{pkgdir}/libidentitymap.so
+%{_libdir}/%{pkgdir}/libarguspdpclient.so
 %{_libdir}/%{pkgdir}/libmcchttp.so
 %{_libdir}/%{pkgdir}/libmccmsgvalidator.so
 %{_libdir}/%{pkgdir}/libmccsoap.so
@@ -1082,6 +1338,7 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_libdir}/%{pkgdir}/libdmcldap.apd
 %{_libdir}/%{pkgdir}/libdmcsrm.apd
 %{_libdir}/%{pkgdir}/libidentitymap.apd
+%{_libdir}/%{pkgdir}/libarguspdpclient.apd
 %{_libdir}/%{pkgdir}/libmcchttp.apd
 %{_libdir}/%{pkgdir}/libmccsoap.apd
 %{_libdir}/%{pkgdir}/libmcctcp.apd
@@ -1098,24 +1355,35 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_libdir}/%{pkgdir}/libdmclfc.so
 %{_libdir}/%{pkgdir}/libdmclfc.apd
 %endif
-%if %{with_xrootd}
-%{_libdir}/%{pkgdir}/libdmcxrootd.so
-%{_libdir}/%{pkgdir}/libdmcxrootd.apd
-%endif
-%{_libdir}/%{pkgdir}/libdmcrls.so
 %{_libdir}/%{pkgdir}/libmccgsi.so
-%{_libdir}/%{pkgdir}/libdmcrls.apd
 %{_libdir}/%{pkgdir}/libmccgsi.apd
 %{_libdir}/libarcglobusutils.so.*
 %{_libexecdir}/%{pkgdir}/arc-lcas
 %{_libexecdir}/%{pkgdir}/arc-lcmaps
 
+%if %{with_canl}
+%files arcproxyalt
+%{_bindir}/arcproxyalt
+%endif
+
+%if %{with_xrootd}
+%files plugins-xrootd
+%defattr(-,root,root,-)
+%{_libdir}/%{pkgdir}/libdmcxrootd.so
+%{_libdir}/%{pkgdir}/libdmcxrootd.apd
+%endif
+
+%if %{with_gfal}
+%files plugins-gfal
+%defattr(-,root,root,-)
+%{_libdir}/%{pkgdir}/libdmcgfal.so
+%{_libdir}/%{pkgdir}/libdmcgfal.apd
+%endif
+
 %if %{with_python}
 %files python
 %defattr(-,root,root,-)
-%{python_sitearch}/_arc*.so
-%{python_sitearch}/arc.py*
-%{python_sitelib}/arcom
+%{python_sitearch}/arc
 %{python_sitelib}/cache
 %{python_sitelib}/echo_python
 %{_libdir}/%{pkgdir}/libaccPythonBroker.so
@@ -1128,18 +1396,13 @@ service fetch-crl-cron start > /dev/null 2>&1
 %if %{?rhel}%{!?rhel:0} == 5
 %files python26
 %defattr(-,root,root,-)
-%{python26_sitearch}/_arc*.so
-%{python26_sitearch}/arc.py*
+%{python26_sitearch}/arc
 %endif
 
 %if %{?fedora}%{!?fedora:0} >= 13
 %files python3
 %defattr(-,root,root,-)
-%{python3_sitearch}/_arc*.so
-%{python3_sitearch}/arc.py*
-%if %{?fedora}%{!?fedora:0} >= 15
-%{python3_sitearch}/__pycache__/arc*
-%endif
+%{python3_sitearch}/arc
 %endif
 
 %if %{with_java}
@@ -1157,8 +1420,7 @@ service fetch-crl-cron start > /dev/null 2>&1
 %files doxygen
 %defattr(-,root,root,-)
 %doc src/doxygen/ARC1-API.pdf
-%doc src/doxygen/ARC1-ChainComponents.pdf
-%doc src/doxygen/ARC1-Services.pdf
+%doc src/doxygen/ARC1-libarcdata.pdf
 
 %files gridmap-utils
 %defattr(-,root,root,-)
@@ -1170,7 +1432,23 @@ service fetch-crl-cron start > /dev/null 2>&1
 %files ca-utils
 %defattr(-,root,root,-)
 
+%files misc-utils
+%defattr(-,root,root,-)
+%{_bindir}/arcemiestest
+%{_bindir}/arcwsrf
+%{_bindir}/arcperftest
+%{_bindir}/saml_assertion_init
+%doc %{_mandir}/man1/arcemiestest.1*
+%doc %{_mandir}/man1/arcwsrf.1*
+%doc %{_mandir}/man1/arcperftest.1*
+%doc %{_mandir}/man1/saml_assertion_init.1*
+
 %changelog
+* Mon Apr 15 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0.0-1
+- 3.0.0 Final Release
+- Drop obsolete patches nordugrid-arc-swig-209.patch and
+  nordugrid-arc-xrootd-private.patch
+
 * Fri Mar 08 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.1-4
 - Rebuild for xrootd 3.3
 
diff --git a/sources b/sources
index 386ed3c..87b3772 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a8e35494ae8310dac1f538787afa244e  nordugrid-arc-2.0.1.tar.gz
+34e12bb0dc0de53126fa94fb419785e7  nordugrid-arc-3.0.0.tar.gz


More information about the scm-commits mailing list