[nordugrid-arc/el5: 3/3] 4.0.0 Final Release

Mattias Ellert ellert at fedoraproject.org
Thu Nov 28 15:11:14 UTC 2013 

commit 6416c98372fb49aaeeeee005be4757b547ecfd14
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Nov 28 16:10:15 2013 +0100

    4.0.0 Final Release

 nordugrid-arc.spec |   60 +++++++++++++++++++++------------------------------
 sources            |    2 +-
 2 files changed, 26 insertions(+), 36 deletions(-)
---
diff --git a/nordugrid-arc.spec b/nordugrid-arc.spec
index e9e1c34..09f6bed 100644
--- a/nordugrid-arc.spec
+++ b/nordugrid-arc.spec
@@ -3,6 +3,8 @@
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
+%{!?_jnidir: %global _jnidir %{_libdir}/java}
+
 %if %{?rhel}%{!?rhel:0} == 5
 %global __python26 %{_bindir}/python2.6
 %{!?python26_sitearch: %global python26_sitearch %(%{__python26} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -90,8 +92,8 @@
 %global pkgdir arc
 
 Name:		nordugrid-arc
-Version:	3.0.3
-Release:	4%{?dist}
+Version:	4.0.0
+Release:	1%{?dist}
 Summary:	Advanced Resource Connector Grid Middleware
 Group:		System Environment/Daemons
 License:	ASL 2.0
@@ -698,20 +700,6 @@ Connector (ARC).
 Java bindings for ARC.
 %endif
 
-%package doxygen
-Summary:	ARC API documentation
-Group:		Documentation
-%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
-BuildArch:	noarch
-%endif
-
-%description doxygen
-NorduGrid is a collaboration aiming at development, maintenance and
-support of the free Grid middleware, known as the Advanced Resource
-Connector (ARC).
-
-Reference to the ARC programming API. It is prepared with doxygen.
-
 %package gridmap-utils
 Summary:	NorduGrid authorization tools
 Group:		Applications/Internet
@@ -805,9 +793,9 @@ cd -
 %if ! %{with_xrootd}
      --disable-xrootd \
 %endif
-     --disable-dbjstore \
      --disable-doc \
-     --with-docdir=%{_pkgdocdir}
+     --with-docdir=%{_pkgdocdir} \
+     --with-jnidir=%{_jnidir}
 
 make %{?_smp_mflags}
 
@@ -886,10 +874,15 @@ make -C src/hed/acc/PythonBroker	DESTDIR=$PWD/docdir/python pkgdatadir= install-
 make -C python/examples			DESTDIR=$PWD/docdir/python pkgdatadir= install-exampleDATA
 make -C java/examples			DESTDIR=$PWD/docdir/java   pkgdatadir= install-exampleDATA
 make -C src/clients			DESTDIR=$PWD/docdir/client pkgdatadir= install-exampleDATA
-make -C src/doc				DESTDIR=$PWD/docdir/base   pkgdatadir= install-exampleDATA
 make -C src/tests/echo			DESTDIR=$PWD/docdir/hed	   pkgdatadir= install-exampleDATA
 make -C src/hed				DESTDIR=$PWD/docdir/hed	   pkgdatadir= install-profileDATA
 
+# arc.conf.reference needs special handling
+make -C src/doc DESTDIR=$RPM_BUILD_ROOT install-exampleDATA
+
+# Link to arc.conf.reference from doc
+ln -s %{_datadir}/%{pkgdir}/examples/arc.conf.reference $PWD/docdir/arc.conf.reference
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1098,7 +1091,7 @@ service fetch-crl-cron start > /dev/null 2>&1
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc docdir/base/* README AUTHORS LICENSE NOTICE ChangeLog
+%doc docdir/arc.conf.reference README AUTHORS LICENSE NOTICE ChangeLog
 %{_libdir}/libarccompute.so.*
 %{_libdir}/libarccommunication.so.*
 %{_libdir}/libarccommon.so.*
@@ -1122,6 +1115,7 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_libdir}/%{pkgdir}/libmodcredential.so
 %{_libdir}/%{pkgdir}/libmodcredential.apd
 %{_libexecdir}/%{pkgdir}/arc-file-access
+%{_datadir}/%{pkgdir}/examples/arc.conf.reference
 %dir %{_datadir}/%{pkgdir}/test-jobs
 %{_datadir}/%{pkgdir}/test-jobs/test-job-*
 %{_datadir}/%{pkgdir}/schema
@@ -1152,7 +1146,6 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_bindir}/arcsub
 %{_bindir}/arcsync
 %{_bindir}/arctest
-%{_bindir}/ngclient2arc
 %config(noreplace) %{_sysconfdir}/%{pkgdir}/client.conf
 %doc %{_mandir}/man1/arcacl.1*
 %doc %{_mandir}/man1/arccat.1*
@@ -1176,7 +1169,6 @@ service fetch-crl-cron start > /dev/null 2>&1
 %doc %{_mandir}/man1/arcsub.1*
 %doc %{_mandir}/man1/arcsync.1*
 %doc %{_mandir}/man1/arctest.1*
-%doc %{_mandir}/man1/ngclient2arc.1*
 
 %files hed
 %defattr(-,root,root,-)
@@ -1201,6 +1193,7 @@ service fetch-crl-cron start > /dev/null 2>&1
 
 %files ldap-infosys
 %defattr(-,root,root,-)
+%{_initrddir}/nordugrid-arc-ldap-infosys
 %{_initrddir}/nordugrid-arc-slapd
 %{_initrddir}/nordugrid-arc-inforeg
 %{_datadir}/%{pkgdir}/create-slapd-config
@@ -1215,8 +1208,6 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_datadir}/%{pkgdir}/create-bdii-config
 %{_datadir}/%{pkgdir}/glue-generator.pl
 %{_datadir}/%{pkgdir}/glite-info-provider-ldap
-%{_datadir}/%{pkgdir}/qju.pl
-%{_datadir}/%{pkgdir}/cluster.pl
 %{_datadir}/%{pkgdir}/se.pl
 %{_datadir}/%{pkgdir}/LRMS.pm
 %{_datadir}/%{pkgdir}/Shared.pm
@@ -1380,11 +1371,11 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_libdir}/%{pkgdir}/test/libaccTEST.so
 %{_libdir}/%{pkgdir}/libarcshc.so
 %{_libdir}/%{pkgdir}/libarcshclegacy.so
-%{_libdir}/%{pkgdir}/libdmcarc.so
 %{_libdir}/%{pkgdir}/libdmcfile.so
 %{_libdir}/%{pkgdir}/libdmchttp.so
 %{_libdir}/%{pkgdir}/libdmcldap.so
 %{_libdir}/%{pkgdir}/libdmcsrm.so
+%{_libdir}/%{pkgdir}/libdmcdq2.so
 %{_libdir}/%{pkgdir}/libidentitymap.so
 %{_libdir}/%{pkgdir}/libarguspdpclient.so
 %{_libdir}/%{pkgdir}/libmcchttp.so
@@ -1402,11 +1393,11 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_libdir}/%{pkgdir}/test/libaccTEST.apd
 %{_libdir}/%{pkgdir}/libarcshc.apd
 %{_libdir}/%{pkgdir}/libarcshclegacy.apd
-%{_libdir}/%{pkgdir}/libdmcarc.apd
 %{_libdir}/%{pkgdir}/libdmcfile.apd
 %{_libdir}/%{pkgdir}/libdmchttp.apd
 %{_libdir}/%{pkgdir}/libdmcldap.apd
 %{_libdir}/%{pkgdir}/libdmcsrm.apd
+%{_libdir}/%{pkgdir}/libdmcdq2.apd
 %{_libdir}/%{pkgdir}/libidentitymap.apd
 %{_libdir}/%{pkgdir}/libarguspdpclient.apd
 %{_libdir}/%{pkgdir}/libmcchttp.apd
@@ -1455,9 +1446,8 @@ service fetch-crl-cron start > /dev/null 2>&1
 %files python
 %defattr(-,root,root,-)
 %doc docdir/python/*
+%{python_sitearch}/_arc.*so
 %{python_sitearch}/arc
-%{python_sitelib}/cache
-%{python_sitelib}/echo_python
 %{_libdir}/%{pkgdir}/libaccPythonBroker.so
 %{_libdir}/%{pkgdir}/libaccPythonBroker.apd
 %{_libdir}/%{pkgdir}/libpythonservice.so
@@ -1467,12 +1457,14 @@ 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
 %endif
 
 %if %{?fedora}%{!?fedora:0} >= 13
 %files python3
 %defattr(-,root,root,-)
+%{python3_sitearch}/_arc.*so
 %{python3_sitearch}/arc
 %endif
 
@@ -1480,8 +1472,8 @@ service fetch-crl-cron start > /dev/null 2>&1
 %files java
 %defattr(-,root,root,-)
 %doc docdir/java/*
-%{_libdir}/java/libjarc.so
-%{_libdir}/java/arc.jar
+%{_libdir}/%{pkgdir}/libjarc.so
+%{_jnidir}/arc.jar
 %{_libdir}/%{pkgdir}/libjavaservice.so
 %{_libdir}/%{pkgdir}/libjavaservice.apd
 %if %{with_gcj}
@@ -1489,11 +1481,6 @@ service fetch-crl-cron start > /dev/null 2>&1
 %endif
 %endif
 
-%files doxygen
-%defattr(-,root,root,-)
-%doc src/doxygen/ARC1-API.pdf
-%doc src/doxygen/ARC1-libarcdata.pdf
-
 %files gridmap-utils
 %defattr(-,root,root,-)
 %{_sbindir}/nordugridmap
@@ -1516,6 +1503,9 @@ service fetch-crl-cron start > /dev/null 2>&1
 %doc %{_mandir}/man1/saml_assertion_init.1*
 
 %changelog
+* Thu Nov 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.0.0-1
+- 4.0.0 Final Release
+
 * Mon Sep 23 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0.3-4
 - Rebuild for gridsite 2 update
 
diff --git a/sources b/sources
index 18d53dc..af22928 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe5d208c20bdeb665b5d5322e16fed48  nordugrid-arc-3.0.3.tar.gz
+41d3647a337ed2831d0c6f0ef5c92649  nordugrid-arc-4.0.0.tar.gz

More information about the scm-commits mailing list