[globus-gram-client/el5: 4/4] Update to Globus Toolkit 6.0

Mattias Ellert ellert at fedoraproject.org
Thu Sep 18 15:38:31 UTC 2014 

commit 06108de7e9e3b63fd0a3aa8e424666e5babb07b2
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Sep 18 17:36:48 2014 +0200

    Update to Globus Toolkit 6.0
    
    - Drop GPT build system and GPT packaging metadata
    - Enable checks

 globus-gram-client-doxygen.patch |   74 ++++++++++++++++++++++++
 globus-gram-client.spec          |  117 +++++++++++++-------------------------
 sources                          |    2 +-
 3 files changed, 115 insertions(+), 78 deletions(-)
---
diff --git a/globus-gram-client-doxygen.patch b/globus-gram-client-doxygen.patch
new file mode 100644
index 0000000..cc72507
--- /dev/null
+++ b/globus-gram-client-doxygen.patch
@@ -0,0 +1,74 @@
+diff --git a/Makefile.am b/Makefile.am
+index 7997331..bf42767 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -40,7 +40,7 @@ all-local: $(DOC_STAMPS)
+ install-data-local: $(DOC_STAMPS)
+ 	if test -d doc/man/man3; then \
+ 		install -d -m 755 $(DESTDIR)$(mandir)/man3; \
+-	        $(INSTALL) -m 644 doc/man/man3/globus*.3 $(DESTDIR)$(mandir)/man3 ; \
++	        $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \
+         fi
+ 	if test -d doc/html; then \
+ 		for dir in `(cd doc; find html -type d)`; do \
+diff --git a/Makefile.in b/Makefile.in
+index 7997331..bf42767 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -40,7 +40,7 @@ all-local: $(DOC_STAMPS)
+ install-data-local: $(DOC_STAMPS)
+ 	if test -d doc/man/man3; then \
+ 		install -d -m 755 $(DESTDIR)$(mandir)/man3; \
+-	        $(INSTALL) -m 644 doc/man/man3/globus*.3 $(DESTDIR)$(mandir)/man3 ; \
++	        $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \
+         fi
+ 	if test -d doc/html; then \
+ 		for dir in `(cd doc; find html -type d)`; do \
+diff --git a/globus_gram_client.c b/globus_gram_client.c
+index 6fbc6d5..5fe8159 100644
+--- a/globus_gram_client.c
++++ b/globus_gram_client.c
+@@ -18,7 +18,7 @@
+ /**
+  * @file globus_gram_client.c
+  * 
+- * Resource Managemant Client APIs
++ * @brief Resource Managemant Client APIs
+  * 
+  * This file contains the GRAM Client API functions.
+  * This API provides functions for submitting a job request to a GRAM resource,
+diff --git a/globus_gram_client.h b/globus_gram_client.h
+index 51e95ce..fcfaaa2 100644
+--- a/globus_gram_client.h
++++ b/globus_gram_client.h
+@@ -15,7 +15,9 @@
+  */
+ 
+ /**
+- * @file globus_gram_client.h GRAM Client API
++ * @file globus_gram_client.h
++ * @brief GRAM Client API
++ *
+  * @details
+  * This header file contains the exported client interface of 
+  * the Resource Allocation Management System.
+diff --git a/globus_gram_client_attr.c b/globus_gram_client_attr.c
+index 398b8f9..b4964b0 100644
+--- a/globus_gram_client_attr.c
++++ b/globus_gram_client_attr.c
+@@ -16,13 +16,8 @@
+ 
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+- * @file globus_gram_client_attr.h Attribute Functions
+- *
+- * CVS Information:
+- *    $Source$
+- * $Date$
+- * $Revision$
+- * $Author$
++ * @file globus_gram_client_attr.h
++ * @brief Attribute Functions
+  */
+ #endif
+ 
diff --git a/globus-gram-client.spec b/globus-gram-client.spec
index 3c07670..b0878f3 100644
--- a/globus-gram-client.spec
+++ b/globus-gram-client.spec
@@ -1,70 +1,39 @@
-%ifarch aarch64 alpha ia64 %{power64} s390x sparc64 x86_64
-%global flavor gcc64
-%else
-%global flavor gcc32
-%endif
-
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		globus-gram-client
 %global _name %(tr - _ <<< %{name})
-Version:	12.4
-Release:	11%{?dist}
+Version:	13.8
+Release:	1%{?dist}
 Summary:	Globus Toolkit - GRAM Client Library
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.1/packages/src/%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-GRAM5
+#		Doxygen fixes
+Patch0:		%{name}-doxygen.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	globus-gram-protocol%{?_isa} >= 11
-Requires:	globus-common%{?_isa} >= 14
-Requires:	globus-gss-assist%{?_isa} >= 8
-Requires:	globus-rsl%{?_isa} >= 9
-Requires:	globus-io%{?_isa} >= 9
-BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core >= 8
+BuildRequires:	globus-common-devel >= 15
 BuildRequires:	globus-gram-protocol-devel >= 11
-BuildRequires:	globus-common-devel >= 14
-BuildRequires:	globus-gss-assist-devel >= 8
-BuildRequires:	globus-rsl-devel >= 9
 BuildRequires:	globus-io-devel >= 9
-BuildRequires:	globus-gram-protocol-doc >= 11
-BuildRequires:	globus-common-doc >= 14
+BuildRequires:	globus-rsl-devel >= 9
+BuildRequires:	globus-gss-assist-devel >= 8
 BuildRequires:	doxygen
-BuildRequires:	graphviz
-%if "%{?rhel}" == "5"
-BuildRequires:	graphviz-gd
-%endif
-BuildRequires:	ghostscript
-BuildRequires:	tex(latex)
-%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
-BuildRequires:	tex(fullpage.sty)
-BuildRequires:	tex(multirow.sty)
-BuildRequires:	tex(sectsty.sty)
-BuildRequires:	tex(tocloft.sty)
-BuildRequires:	tex(xtab.sty)
-BuildRequires:	tex-ec
-BuildRequires:	tex-courier
-BuildRequires:	tex-helvetic
-BuildRequires:	tex-times
-BuildRequires:	tex-symbol
-BuildRequires:	tex-rsfs
-%endif
+#		Additional requirements for make check
+BuildRequires:	openssl
 
 %package devel
 Summary:	Globus Toolkit - GRAM Client Library Development Files
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	globus-common-devel%{?_isa} >= 15
 Requires:	globus-gram-protocol-devel%{?_isa} >= 11
-Requires:	globus-common-devel%{?_isa} >= 14
-Requires:	globus-gss-assist-devel%{?_isa} >= 8
-Requires:	globus-rsl-devel%{?_isa} >= 9
 Requires:	globus-io-devel%{?_isa} >= 9
-Requires:	globus-core%{?_isa} >= 8
+Requires:	globus-rsl-devel%{?_isa} >= 9
+Requires:	globus-gss-assist-devel%{?_isa} >= 8
 
 %package doc
 Summary:	Globus Toolkit - GRAM Client Library Documentation Files
@@ -72,7 +41,6 @@ Group:		Documentation
 %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
 BuildArch:	noarch
 %endif
-Requires:	%{name} = %{version}-%{release}
 
 %description
 The Globus Toolkit is an open source software toolkit used for building Grid
@@ -103,21 +71,16 @@ GRAM Client Library Documentation Files
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %build
-# Remove files that should be replaced during bootstrap
-rm -f doxygen/Doxyfile*
-rm -f doxygen/Makefile.am
-rm -f pkgdata/Makefile.am
-rm -f globus_automake*
-rm -rf autom4te.cache
-
-unset GLOBUS_LOCATION
-unset GPT_LOCATION
-%{_datadir}/globus/globus-bootstrap.sh
+# Reduce overlinking
+export LDFLAGS="-Wl,--as-needed -Wl,-z,defs %{?__global_ldflags}"
 
-%configure --disable-static --with-flavor=%{flavor} \
-	   --enable-doxygen --with-docdir=%{_pkgdocdir}
+%configure --disable-static \
+	   --includedir='${prefix}/include/globus' \
+	   --libexecdir='${datadir}/globus' \
+	   --docdir=%{_pkgdocdir}
 
 # Reduce overlinking
 sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -128,27 +91,14 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
-
 # Remove libtool archives (.la files)
-find %{buildroot}%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
-
-# Move license file to main package
-grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
-  >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
-sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
+rm %{buildroot}%{_libdir}/*.la
 
 # Install README file
 install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
 
-# Generate package filelists
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
-  | sed s!^!%{_prefix}! > package.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
-  | sed s!^!%{_prefix}! > package-devel.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
-  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
+%check
+make check
 
 %clean
 rm -rf %{buildroot}
@@ -157,17 +107,30 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%files -f package.filelist
-%dir %{_datadir}/globus/packages/%{_name}
+%files
+%{_libdir}/libglobus_gram_client.so.*
 %dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %doc %{_pkgdocdir}/README
 
-%files -f package-devel.filelist devel
+%files devel
+%{_includedir}/globus/*
+%{_libdir}/libglobus_gram_client.so
+%{_libdir}/pkgconfig/%{name}.pc
 
-%files -f package-doc.filelist doc
+%files doc
+%doc %{_mandir}/man3/*
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %dir %{_pkgdocdir}/html
+%doc %{_pkgdocdir}/html/*
 
 %changelog
+* Fri Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 13.8-1
+- Update to Globus Toolkit 6.0
+- Drop GPT build system and GPT packaging metadata
+- Enable checks
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index a059b9f..e1df27f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a227397b7aa7dc355a9773d6198ea139  globus_gram_client-12.4.tar.gz
+69a4dbc662461dffc859dd5f1fee353c  globus_gram_client-13.8.tar.gz

More information about the scm-commits mailing list