[nordugrid-arc/el5] 2.0.0 Final Release
Mattias Ellert
ellert at fedoraproject.org
Thu Jun 14 16:09:16 UTC 2012
commit 1115bfe50a9634c9913c9596ba8dfa46e62753d2
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Jun 14 18:08:39 2012 +0200
2.0.0 Final Release
- Disable chelonia, hopi, isis and janitor
nordugrid-arc-missing-header.patch | 170 ---------------------------------
nordugrid-arc-pypara.patch | 21 ++++
nordugrid-arc-threads.patch | 21 ----
nordugrid-arc-unistd.patch | 65 +++++++++++++
nordugrid-arc-xmlns.patch | 63 ++++++++++++
nordugrid-arc.spec | 185 ++++++++++++++----------------------
sources | 2 +-
7 files changed, 223 insertions(+), 304 deletions(-)
---
diff --git a/nordugrid-arc-pypara.patch b/nordugrid-arc-pypara.patch
new file mode 100644
index 0000000..cae9d74
--- /dev/null
+++ b/nordugrid-arc-pypara.patch
@@ -0,0 +1,21 @@
+diff -ur nordugrid-arc-2.0.0.orig/python/Makefile.am nordugrid-arc-2.0.0/python/Makefile.am
+--- nordugrid-arc-2.0.0.orig/python/Makefile.am 2012-05-23 18:44:23.000000000 +0200
++++ nordugrid-arc-2.0.0/python/Makefile.am 2012-06-02 21:05:47.252414581 +0200
+@@ -115,3 +115,5 @@
+
+ DIST_SUBDIRS = test
+ SUBDIRS = $(TEST_DIR)
++
++.NOTPARALLEL: %.lo %.o
+diff -ur nordugrid-arc-2.0.0.orig/python/Makefile.in nordugrid-arc-2.0.0/python/Makefile.in
+--- nordugrid-arc-2.0.0.orig/python/Makefile.in 2012-05-23 18:46:57.000000000 +0200
++++ nordugrid-arc-2.0.0/python/Makefile.in 2012-06-02 21:07:16.439604104 +0200
+@@ -1084,6 +1084,8 @@
+ $(DESTDIR)$(altpythondir)/_arc.$(ALTPYTHON_SOABI).so ; \
+ fi
+
++.NOTPARALLEL: %.lo %.o
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/nordugrid-arc-unistd.patch b/nordugrid-arc-unistd.patch
new file mode 100644
index 0000000..9154cb5
--- /dev/null
+++ b/nordugrid-arc-unistd.patch
@@ -0,0 +1,65 @@
+diff -ur nordugrid-arc-2.0.0.orig/src/clients/arclib/utils.h nordugrid-arc-2.0.0/src/clients/arclib/utils.h
+--- nordugrid-arc-2.0.0.orig/src/clients/arclib/utils.h 2012-05-23 18:44:25.000000000 +0200
++++ nordugrid-arc-2.0.0/src/clients/arclib/utils.h 2012-05-24 07:25:50.170073619 +0200
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include <string>
+ #include <list>
+ #include <arc/Logger.h>
+diff -ur nordugrid-arc-2.0.0.orig/src/hed/acc/EMIES/SubmitterPluginEMIES.cpp nordugrid-arc-2.0.0/src/hed/acc/EMIES/SubmitterPluginEMIES.cpp
+--- nordugrid-arc-2.0.0.orig/src/hed/acc/EMIES/SubmitterPluginEMIES.cpp 2012-05-23 18:44:24.000000000 +0200
++++ nordugrid-arc-2.0.0/src/hed/acc/EMIES/SubmitterPluginEMIES.cpp 2012-05-24 06:58:10.774201243 +0200
+@@ -4,6 +4,7 @@
+ #include <config.h>
+ #endif
+
++#include <unistd.h>
+ #include <string>
+ #include <sstream>
+
+diff -ur nordugrid-arc-2.0.0.orig/src/hed/libs/client/EntityRetriever.h nordugrid-arc-2.0.0/src/hed/libs/client/EntityRetriever.h
+--- nordugrid-arc-2.0.0.orig/src/hed/libs/client/EntityRetriever.h 2012-05-23 18:44:24.000000000 +0200
++++ nordugrid-arc-2.0.0/src/hed/libs/client/EntityRetriever.h 2012-05-24 06:53:33.890229644 +0200
+@@ -94,7 +94,7 @@
+ class EntityContainer : public EntityConsumer<T>, public std::list<T> {
+ public:
+ virtual ~EntityContainer() {}
+- virtual void addEntity(const T& t) { push_back(t); }
++ virtual void addEntity(const T& t) { this->push_back(t); }
+ };
+
+ template<typename T>
+diff -ur nordugrid-arc-2.0.0.orig/src/hed/libs/common/Thread.cpp nordugrid-arc-2.0.0/src/hed/libs/common/Thread.cpp
+--- nordugrid-arc-2.0.0.orig/src/hed/libs/common/Thread.cpp 2012-05-23 18:44:24.000000000 +0200
++++ nordugrid-arc-2.0.0/src/hed/libs/common/Thread.cpp 2012-05-24 06:27:57.590391694 +0200
+@@ -10,6 +10,7 @@
+ #include <stdint.h>
+ #endif
+
++#include <unistd.h>
+ #include <glibmm/init.h>
+
+ #ifdef USE_THREAD_POOL
+diff -ur nordugrid-arc-2.0.0.orig/src/hed/libs/loader/ModuleManager.cpp nordugrid-arc-2.0.0/src/hed/libs/loader/ModuleManager.cpp
+--- nordugrid-arc-2.0.0.orig/src/hed/libs/loader/ModuleManager.cpp 2012-05-23 18:44:24.000000000 +0200
++++ nordugrid-arc-2.0.0/src/hed/libs/loader/ModuleManager.cpp 2012-05-24 06:37:59.474335134 +0200
+@@ -2,6 +2,8 @@
+ #include <config.h>
+ #endif
+
++#include <unistd.h>
++
+ #include <arc/ArcLocation.h>
+ #include <arc/loader/ModuleManager.h>
+
+diff -ur nordugrid-arc-2.0.0.orig/src/services/a-rex/grid-manager/arc_vomsac_check.cpp nordugrid-arc-2.0.0/src/services/a-rex/grid-manager/arc_vomsac_check.cpp
+--- nordugrid-arc-2.0.0.orig/src/services/a-rex/grid-manager/arc_vomsac_check.cpp 2012-05-23 18:44:26.000000000 +0200
++++ nordugrid-arc-2.0.0/src/services/a-rex/grid-manager/arc_vomsac_check.cpp 2012-05-24 07:14:50.274098977 +0200
+@@ -2,6 +2,7 @@
+ #include <config.h>
+ #endif
+
++#include <unistd.h>
+ #include <iostream>
+ #include <fstream>
+ #include <sys/stat.h>
diff --git a/nordugrid-arc-xmlns.patch b/nordugrid-arc-xmlns.patch
new file mode 100644
index 0000000..1395373
--- /dev/null
+++ b/nordugrid-arc-xmlns.patch
@@ -0,0 +1,63 @@
+diff -ur nordugrid-arc-2.0.0.orig/src/hed/acc/JobDescriptionParser/test/ARCJSDLParserTest.cpp nordugrid-arc-2.0.0/src/hed/acc/JobDescriptionParser/test/ARCJSDLParserTest.cpp
+--- nordugrid-arc-2.0.0.orig/src/hed/acc/JobDescriptionParser/test/ARCJSDLParserTest.cpp 2012-05-23 18:44:24.000000000 +0200
++++ nordugrid-arc-2.0.0/src/hed/acc/JobDescriptionParser/test/ARCJSDLParserTest.cpp 2012-06-09 07:00:35.823112906 +0200
+@@ -193,7 +193,8 @@
+
+ void ARCJSDLParserTest::TestURIOptionsInput() {
+ std::string jsdl = "<?xml version=\"1.0\"?>"
+-"<JobDefinition xmlns=\"http://schemas.ggf.org/jsdl/2005/11/jsdl\">"
++"<JobDefinition xmlns=\"http://schemas.ggf.org/jsdl/2005/11/jsdl\""
++" xmlns:posix-jsdl=\"http://schemas.ggf.org/jsdl/2005/11/jsdl-posix\">"
+ "<JobDescription>"
+ "<Application>"
+ "<posix-jsdl:POSIXApplication>"
+@@ -222,7 +223,8 @@
+
+ void ARCJSDLParserTest::TestURIOptionsOutput() {
+ std::string jsdl = "<?xml version=\"1.0\"?>"
+-"<JobDefinition xmlns=\"http://schemas.ggf.org/jsdl/2005/11/jsdl\">"
++"<JobDefinition xmlns=\"http://schemas.ggf.org/jsdl/2005/11/jsdl\""
++" xmlns:posix-jsdl=\"http://schemas.ggf.org/jsdl/2005/11/jsdl-posix\">"
+ "<JobDescription>"
+ "<Application>"
+ "<posix-jsdl:POSIXApplication>"
+@@ -269,7 +271,8 @@
+
+ void ARCJSDLParserTest::TestQueue() {
+ std::string jsdl = "<?xml version=\"1.0\"?>"
+-"<JobDefinition xmlns=\"http://schemas.ggf.org/jsdl/2005/11/jsdl\">"
++"<JobDefinition xmlns=\"http://schemas.ggf.org/jsdl/2005/11/jsdl\""
++" xmlns:posix-jsdl=\"http://schemas.ggf.org/jsdl/2005/11/jsdl-posix\">"
+ "<JobDescription>"
+ "<Application>"
+ "<posix-jsdl:POSIXApplication>"
+@@ -296,7 +299,8 @@
+ CPPUNIT_ASSERT_EQUAL(0, (int)OUTJOBS.front().GetAlternatives().size());
+
+ jsdl = "<?xml version=\"1.0\"?>"
+-"<JobDefinition xmlns=\"http://schemas.ggf.org/jsdl/2005/11/jsdl\">"
++"<JobDefinition xmlns=\"http://schemas.ggf.org/jsdl/2005/11/jsdl\""
++" xmlns:posix-jsdl=\"http://schemas.ggf.org/jsdl/2005/11/jsdl-posix\">"
+ "<JobDescription>"
+ "<Application>"
+ "<posix-jsdl:POSIXApplication>"
+@@ -385,7 +389,8 @@
+ MESSAGE = "Error: The parser does not comply with the JDSL POSIX specification.";
+
+ const std::string posixJSDLStr = "<?xml version=\"1.0\"?>"
+-"<JobDefinition xmlns=\"http://schemas.ggf.org/jsdl/2005/11/jsdl\">"
++"<JobDefinition xmlns=\"http://schemas.ggf.org/jsdl/2005/11/jsdl\""
++" xmlns:posix-jsdl=\"http://schemas.ggf.org/jsdl/2005/11/jsdl-posix\">"
+ "<JobDescription>"
+ "<Application>"
+ "<posix-jsdl:POSIXApplication>"
+@@ -477,7 +482,8 @@
+ MESSAGE = "Error: The parser does not comply with the JSDL HPC Profile Application Extension specification.";
+
+ const std::string hpcJSDLStr = "<?xml version=\"1.0\"?>"
+-"<JobDefinition xmlns=\"http://schemas.ggf.org/jsdl/2005/11/jsdl\">"
++"<JobDefinition xmlns=\"http://schemas.ggf.org/jsdl/2005/11/jsdl\""
++" xmlns:HPC-jsdl=\"http://schemas.ggf.org/jsdl/2006/07/jsdl-hpcpa\">"
+ "<JobDescription>"
+ "<Application>"
+ "<HPC-jsdl:HPCProfileApplication>"
diff --git a/nordugrid-arc.spec b/nordugrid-arc.spec
index 7a9c5c8..956d7ef 100644
--- a/nordugrid-arc.spec
+++ b/nordugrid-arc.spec
@@ -20,7 +20,14 @@
%filter_setup
%endif
+%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0}
+%global with_xrootd %{!?_without_xrootd:1}%{?_without_xrootd:0}
+%else
+%global with_xrootd 0
+%endif
+
%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}
%else
@@ -46,17 +53,24 @@
%global pkgdir arc
Name: nordugrid-arc
-Version: 1.1.1
+Version: 2.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}-missing-header.patch
-Patch1: %{name}-threads.patch
+Patch0: %{name}-unistd.patch
+Patch1: %{name}-pypara.patch
+Patch2: %{name}-xmlns.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Packages dropped without replacements
+Obsoletes: nordugrid-arc-chelonia < 2.0.0
+Obsoletes: nordugrid-arc-hopi < 2.0.0
+Obsoletes: nordugrid-arc-isis < 2.0.0
+Obsoletes: nordugrid-arc-janitor < 2.0.0
+
BuildRequires: cppunit-devel
BuildRequires: pkgconfig
%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
@@ -90,7 +104,14 @@ BuildRequires: globus-rls-client-devel
BuildRequires: lfc-devel
%endif
BuildRequires: gridsite-devel
+%if %{with_xrootd}
+BuildRequires: xrootd-devel
+%endif
+%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 7
+BuildRequires: libdb-cxx-devel
+%else
BuildRequires: db4-devel
+%endif
%if %{with_java}
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@ -163,61 +184,6 @@ Connector (ARC).
The ARC Hosting Environment Daemon (HED). This daemon is a container for
ARC services.
-%if %{with_python}
-%package chelonia
-Summary: ARC chelonia service
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-hed = %{version}-%{release}
-Requires: %{name}-python = %{version}-%{release}
-Requires: fuse-python
-%if %{?fedora}%{!?fedora:0} >= 10
-BuildArch: noarch
-%endif
-
-%description chelonia
-NorduGrid is a collaboration aiming at development, maintenance and
-support of the free Grid middleware, known as the Advanced Resource
-Connector (ARC).
-
-The ARC storage service Chelonia consists of a set of SOAP based
-services residing within HED. Together, the services provide a self-healing,
-reliable, robust, scalable, resilient and consistent data storage system.
-%endif
-
-%package hopi
-Summary: ARC hopi service
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-hed = %{version}-%{release}
-
-%description hopi
-NorduGrid is a collaboration aiming at development, maintenance and
-support of the free Grid middleware, known as the Advanced Resource
-Connector (ARC).
-
-The HOPI service provides a simple implementation of an http(s)
-server. It supports GET and PUT operations. It can be used as a simple
-file transfer service and it is usable via common web browsers and
-other http(s) clients (e.g. wget).
-
-%package isis
-Summary: ARC isis service
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-hed = %{version}-%{release}
-Requires: %{name}-plugins-needed = %{version}-%{release}
-
-%description isis
-NorduGrid is a collaboration aiming at development, maintenance and
-support of the free Grid middleware, known as the Advanced Resource
-Connector (ARC).
-
-ISIS is the new ARC information system implemented within HED. ISIS
-comes with P2P capabilities and a web-services interface. The new system
-grants grid participants an increase in flexibility, robustness and it
-also offers easier configuration and self-healing capability.
-
%package gridftpd
Summary: ARC gridftp server
Group: System Environment/Daemons
@@ -380,6 +346,8 @@ Requires: %{name}-plugins-needed = %{version}-%{release}
Requires: mktemp
Requires: python-twisted-core
Requires: python-twisted-web
+Requires: stomppy
+Requires: m2crypto
Requires: %{name}-aris = %{version}-%{release}
Requires(post): chkconfig
@@ -500,27 +468,6 @@ Connector (ARC).
Java bindings for ARC.
%endif
-%package janitor
-Summary: ARC dynamic installation of runtime environments
-Group: Applications/Internet
-Requires: wget
-%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
-BuildArch: noarch
-%endif
-
-%description janitor
-NorduGrid is a collaboration aiming at development, maintenance and
-support of the free Grid middleware, known as the Advanced Resource
-Connector (ARC).
-
-For grid computing, a major challenge is to keep the working environments
-homogeneous between the sites. To help this situation, runtime
-environments have been developed. Those can be added to or removed from
-a site, and this Janitor service helps automating this process.
-
-The Janitor is a recent development and the community to prepare
-catalogs of dynamically installable packages still needs to evolve.
-
%package doxygen
Summary: ARC API documentation
Group: Documentation
@@ -575,6 +522,7 @@ fetch-crl tool in the fetch-crl package.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%if %{?fedora}%{!?fedora:0} <= 9 && %{?rhel}%{!?rhel:0} <= 5
# Older versions of SELinux does not have policy for open
@@ -600,7 +548,13 @@ cd -
%if %{?fedora}%{!?fedora:0} >= 13
--with-altpython=python3 \
%endif
+%if ! %{with_xrootd}
--disable-xrootd \
+%endif
+ --disable-storage-service \
+ --disable-hopi-service \
+ --disable-isis-service \
+ --disable-janitor-service \
--disable-doc \
--with-docdir=%{_docdir}/%{name}-%{version}
@@ -628,6 +582,8 @@ install -p -m 644 debian/%{name}-gridftpd.logrotate \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}-gridftpd
install -p -m 644 debian/%{name}-aris.logrotate \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}-aris
+install -p -m 644 debian/%{name}-datadelivery-service.logrotate \
+ $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}-datadelivery-service
find $RPM_BUILD_ROOT -type f -name \*.la -exec rm -fv '{}' ';'
@@ -830,6 +786,7 @@ service fetch-crl-cron start > /dev/null 2>&1
%{_libdir}/libarccredentialstore.so.*
%{_libdir}/libarccrypto.so.*
%{_libdir}/libarcdata2.so.*
+%{_libdir}/libarcdatastaging.so.*
%{_libdir}/libarcdbxml.so.*
%{_libdir}/libarcloader.so.*
%{_libdir}/libarcmessage.so.*
@@ -848,12 +805,16 @@ service fetch-crl-cron start > /dev/null 2>&1
%doc %{_mandir}/man1/ngconfigtest.1*
%dir %{_datadir}/%{pkgdir}/examples
%doc %{_datadir}/%{pkgdir}/examples/arc.conf.template
+%doc %{_datadir}/%{pkgdir}/examples/arc.conf.reference
+%dir %{_datadir}/%{pkgdir}/test-jobs
+%{_datadir}/%{pkgdir}/test-jobs/test-job-*
%{_datadir}/%{pkgdir}/schema
%dir %{_datadir}/%{pkgdir}
%doc README AUTHORS LICENSE
%files client
%defattr(-,root,root,-)
+%{_bindir}/arcacl
%{_bindir}/arccat
%{_bindir}/arcclean
%{_bindir}/arccp
@@ -863,6 +824,7 @@ service fetch-crl-cron start > /dev/null 2>&1
%{_bindir}/arckill
%{_bindir}/arcls
%{_bindir}/arcmigrate
+%{_bindir}/arcmkdir
%{_bindir}/arcproxy
%{_bindir}/arcrenew
%{_bindir}/arcresub
@@ -881,6 +843,7 @@ service fetch-crl-cron start > /dev/null 2>&1
%{_bindir}/ngclient2arc
%config(noreplace) %{_sysconfdir}/%{pkgdir}/client.conf
%doc %{_datadir}/%{pkgdir}/examples/client.conf
+%doc %{_mandir}/man1/arcacl.1*
%doc %{_mandir}/man1/arccat.1*
%doc %{_mandir}/man1/arcclean.1*
%doc %{_mandir}/man1/arccp.1*
@@ -890,6 +853,7 @@ service fetch-crl-cron start > /dev/null 2>&1
%doc %{_mandir}/man1/arckill.1*
%doc %{_mandir}/man1/arcls.1*
%doc %{_mandir}/man1/arcmigrate.1*
+%doc %{_mandir}/man1/arcmkdir.1*
%doc %{_mandir}/man1/arcproxy.1*
%doc %{_mandir}/man1/arcrenew.1*
%doc %{_mandir}/man1/arcresub.1*
@@ -919,27 +883,6 @@ service fetch-crl-cron start > /dev/null 2>&1
%doc %{_mandir}/man8/arched.8*
%doc %{_mandir}/man5/arc.conf.5*
-%if %{with_python}
-%files chelonia
-%defattr(-,root,root,-)
-%{_bindir}/arcfs
-%{_bindir}/chelonia
-%doc %{_mandir}/man1/chelonia.1*
-%{python_sitelib}/storage
-%doc %{_datadir}/%{pkgdir}/examples/storage_service.xml.example
-%endif
-
-%files hopi
-%defattr(-,root,root,-)
-%{_libdir}/%{pkgdir}/libhopi.so
-%{_libdir}/%{pkgdir}/libhopi.apd
-%doc %{_datadir}/%{pkgdir}/examples/hopi
-
-%files isis
-%defattr(-,root,root,-)
-%{_libdir}/%{pkgdir}/libisis.so
-%{_libdir}/%{pkgdir}/libisis.apd
-
%files gridftpd
%defattr(-,root,root,-)
%{_initrddir}/gridftpd
@@ -948,6 +891,7 @@ service fetch-crl-cron start > /dev/null 2>&1
%{_libdir}/%{pkgdir}/gaclplugin.*
%{_libdir}/%{pkgdir}/fileplugin.*
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-gridftpd
+%doc %{_mandir}/man8/gridftpd.8*
%files aris
%defattr(-,root,root,-)
@@ -998,6 +942,7 @@ service fetch-crl-cron start > /dev/null 2>&1
%{_initrddir}/arc-datadelivery-service
%{_libdir}/%{pkgdir}/libdatadeliveryservice.so
%{_libdir}/%{pkgdir}/libdatadeliveryservice.apd
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-datadelivery-service
%files arex
%defattr(-,root,root,-)
@@ -1012,6 +957,7 @@ service fetch-crl-cron start > /dev/null 2>&1
%{_libexecdir}/%{pkgdir}/smtp-send.sh
%{_libexecdir}/%{pkgdir}/uploader
%{_libexecdir}/%{pkgdir}/inputcheck
+%{_libexecdir}/%{pkgdir}/arc-vomsac-check
%{_libexecdir}/%{pkgdir}/arc-ur-logger
%{_libexecdir}/%{pkgdir}/arc-ur-registrant
%{_datadir}/%{pkgdir}/cancel-*-job
@@ -1063,9 +1009,18 @@ 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/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
+%endif
%files devel
%defattr(-,root,root,-)
@@ -1081,10 +1036,13 @@ 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}/libaccCREAM.so
+%{_libdir}/%{pkgdir}/libaccEMIES.so
%{_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}/libdmcarc.so
@@ -1099,10 +1057,13 @@ 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}/libaccCREAM.apd
+%{_libdir}/%{pkgdir}/libaccEMIES.apd
%{_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}/libdmcarc.apd
@@ -1127,6 +1088,10 @@ 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
@@ -1179,14 +1144,6 @@ service fetch-crl-cron start > /dev/null 2>&1
%endif
%endif
-%files janitor
-%defattr(-,root,root,-)
-%{_libexecdir}/%{pkgdir}/janitor
-%{_datadir}/%{pkgdir}/janitor
-%dir %{_datadir}/%{pkgdir}/perl
-%{_datadir}/%{pkgdir}/perl/Janitor
-%doc %{_mandir}/man8/janitor.8*
-
%files doxygen
%defattr(-,root,root,-)
%doc src/doxygen/ARC1-API.pdf
@@ -1204,6 +1161,10 @@ service fetch-crl-cron start > /dev/null 2>&1
%defattr(-,root,root,-)
%changelog
+* Wed May 23 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.0-1
+- 2.0.0 Final Release
+- Disable chelonia, hopi, isis and janitor
+
* Tue Mar 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.1.1-1
- 1.1.1 Bugfix Release
diff --git a/sources b/sources
index 8a76344..ce48324 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a5fa57f5151240b0044086d58a999975 nordugrid-arc-1.1.1.tar.gz
+7a4f9e2e508653ca6d00f5c2daefdadb nordugrid-arc-2.0.0.tar.gz
More information about the scm-commits
mailing list