[globus-rls-client/el4] Recompile against Globus Toolkit 5.2.0

Mattias Ellert ellert at fedoraproject.org
Sun Jan 8 01:20:46 UTC 2012 

commit d473582619faaed99a4c7fe02ef031191c3985e2
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Jan 7 22:42:18 2012 +0100

    Recompile against Globus Toolkit 5.2.0

 .gitignore                   |    4 +-
 GLOBUS-RLS                   |    6 ++++
 globus-rls-client-deps.patch |   45 ++++++++++++++++++++++++++++++++
 globus-rls-client.spec       |   59 ++++++++++++++++++++----------------------
 4 files changed, 81 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 26384e2..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-epstopdf-2.9.5gw
-globus_rls_client-5.2.tar.gz
+/epstopdf-2.9.5gw
+/*.tar.gz
diff --git a/GLOBUS-RLS b/GLOBUS-RLS
index 1bf0782..2ff1552 100644
--- a/GLOBUS-RLS
+++ b/GLOBUS-RLS
@@ -6,6 +6,9 @@ http://www.globus.org/toolkit/docs/latest-stable/data/rls/
 Admin Guide:
 http://www.globus.org/toolkit/docs/latest-stable/data/rls/admin/
 
+User's Guide:
+http://www.globus.org/toolkit/docs/latest-stable/data/rls/user/
+
 Developer's Guide:
 http://www.globus.org/toolkit/docs/latest-stable/data/rls/developer/
 
@@ -20,3 +23,6 @@ http://www.globus.org/toolkit/docs/latest-stable/data/rls/qp/
 
 Migrating Guide:
 http://www.globus.org/toolkit/docs/latest-stable/data/rls/mig/
+
+Globus RPM packaging is supported by the Initiative for Globus in Europe:
+http://www.ige-project.eu/
diff --git a/globus-rls-client-deps.patch b/globus-rls-client-deps.patch
new file mode 100644
index 0000000..6c041c8
--- /dev/null
+++ b/globus-rls-client-deps.patch
@@ -0,0 +1,45 @@
+diff -ur globus_rls_client-5.2.orig/pkgdata/pkg_data_src.gpt.in globus_rls_client-5.2/pkgdata/pkg_data_src.gpt.in
+--- globus_rls_client-5.2.orig/pkgdata/pkg_data_src.gpt.in	2009-10-27 05:13:55.000000000 +0100
++++ globus_rls_client-5.2/pkgdata/pkg_data_src.gpt.in	2011-12-17 09:59:43.347898173 +0100
+@@ -11,31 +11,31 @@
+ 
+         <Source_Dependencies Type="compile">
+             <Dependency Name="globus_core">
+-                <Version><Simple_Version Major="4"/></Version></Dependency>
++                <Version><Simple_Version Major="8"/></Version></Dependency>
+             <Dependency Name="globus_common">
+-                <Version><Simple_Version Major="3"/></Version></Dependency>
++                <Version><Simple_Version Major="14"/></Version></Dependency>
+             <Dependency Name="globus_io">
+-                <Version><Simple_Version Major="3"/></Version></Dependency>
++                <Version><Simple_Version Major="9"/></Version></Dependency>
+             <Dependency Name="globus_gssapi_gsi">
+-                <Version><Simple_Version Major="4"/></Version></Dependency>
++                <Version><Simple_Version Major="10"/></Version></Dependency>
+         </Source_Dependencies>
+ 
+         <Source_Dependencies Type="lib_link">
+             <Dependency Name="globus_common">
+-                <Version><Simple_Version Major="3"/></Version></Dependency>
++                <Version><Simple_Version Major="14"/></Version></Dependency>
+             <Dependency Name="globus_io">
+-                <Version><Simple_Version Major="3"/></Version></Dependency>
++                <Version><Simple_Version Major="9"/></Version></Dependency>
+             <Dependency Name="globus_gssapi_gsi">
+-                <Version><Simple_Version Major="4"/></Version></Dependency>
++                <Version><Simple_Version Major="10"/></Version></Dependency>
+         </Source_Dependencies>
+ 
+         <Source_Dependencies Type="pgm_link">
+             <Dependency Name="globus_common">
+-                <Version><Simple_Version Major="3"/></Version></Dependency>
++                <Version><Simple_Version Major="14"/></Version></Dependency>
+             <Dependency Name="globus_io">
+-                <Version><Simple_Version Major="3"/></Version></Dependency>
++                <Version><Simple_Version Major="9"/></Version></Dependency>
+             <Dependency Name="globus_gssapi_gsi">
+-                <Version><Simple_Version Major="4"/></Version></Dependency>
++                <Version><Simple_Version Major="10"/></Version></Dependency>
+             <Dependency Name="globus_rls_client">
+                 <Version><Simple_Version Major="5"/></Version></Dependency>
+         </Source_Dependencies>
diff --git a/globus-rls-client.spec b/globus-rls-client.spec
index 09f1dab..ee319e6 100644
--- a/globus-rls-client.spec
+++ b/globus-rls-client.spec
@@ -1,13 +1,13 @@
 %ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
 %else
-%global flavor gcc32pthr
+%global flavor gcc32
 %endif
 
 Name:		globus-rls-client
 %global _name %(tr - _ <<< %{name})
 Version:	5.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - Replica Location Service Client
 
 Group:		System Environment/Libraries
@@ -35,14 +35,17 @@ Patch1:		%{name}-format.patch
 #		Fixes for mingw compilation:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
 Patch2:		%{name}-mingw.patch
+#		Depend on GT 5.2.0 library versions
+Patch3:		%{name}-deps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	globus-common
-BuildRequires:	grid-packaging-tools
-BuildRequires:	globus-common-devel%{?_isa} >= 3
-BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
-BuildRequires:	globus-io-devel%{?_isa} >= 3
-BuildRequires:	globus-core%{?_isa} >= 4
+Requires:	globus-common%{?_isa} >= 14
+Requires:	globus-io%{?_isa} >= 9
+BuildRequires:	grid-packaging-tools >= 3.4
+BuildRequires:	globus-core%{?_isa} >= 8
+BuildRequires:	globus-common-devel%{?_isa} >= 14
+BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 10
+BuildRequires:	globus-io-devel%{?_isa} >= 9
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 %if "%{?rhel}" == "5"
@@ -64,10 +67,10 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 Summary:	Globus Toolkit - Replica Location Service Client Development Files
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	globus-common-devel%{?_isa} >= 3
-Requires:	globus-gssapi-gsi-devel%{?_isa} >= 4
-Requires:	globus-io-devel%{?_isa} >= 3
-Requires:	globus-core%{?_isa} >= 4
+Requires:	globus-common-devel%{?_isa} >= 14
+Requires:	globus-gssapi-gsi-devel%{?_isa} >= 10
+Requires:	globus-io-devel%{?_isa} >= 9
+Requires:	globus-core%{?_isa} >= 8
 
 %package doc
 Summary:	Globus Toolkit - Replica Location Service Client Documentation Files
@@ -118,6 +121,7 @@ Replica Location Service Client Documentation Files
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -145,9 +149,15 @@ done
 sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
   -i pkgdata/pkg_data_src.gpt.in
 
+unset GLOBUS_LOCATION
+unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
-%configure --with-flavor=%{flavor} --enable-doxygen
+%configure --disable-static --with-flavor=%{flavor} \
+	   --enable-doxygen --with-docdir=%{_docdir}/%{name}-%{version}
+
+# Reduce overlinking
+sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
 
 make %{?_smp_mflags}
 
@@ -163,16 +173,7 @@ GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
 
 # Remove libtool archives (.la files)
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
-
-# Remove static libraries (.a files)
-find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
-sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
-
-# Generate pkg-config file from GPT metadata
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
-  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 
 # Move client man page to progs package
 grep globus-rls-cli.1 \
@@ -181,12 +182,6 @@ grep globus-rls-cli.1 \
 sed /globus-rls-cli.1/d \
   -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
-# Move documentation to default RPM location
-mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
-  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-sed s!doc/%{_name}!doc/%{name}-%{version}! \
-  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-
 # Remove unwanted documentation (needed for RHEL4)
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
 sed -e '/_%{_name}-%{version}_.*\.3/d' \
@@ -229,13 +224,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/%{name}.pc
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Dec 16 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.2-5
+- Recompile against Globus Toolkit 5.2.0
+
 * Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.2-4
 - Add README file

More information about the scm-commits mailing list