[globus-rsl/el4] Update to Globus Toolkit 5.2.0 Drop patch globus-rsl-doxygen.patch (fixed upstream) Drop patch globu

Sun Jan 8 01:20:35 UTC 2012

commit 34edb5603fd1f91730e28cd239a13857f13d820d
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Jan 7 16:54:21 2012 +0100

    Update to Globus Toolkit 5.2.0
    Drop patch globus-rsl-doxygen.patch (fixed upstream)
    Drop patch globus-rsl-dox-latex.patch (no longer needed)

 .gitignore                 |    2 +-
 GLOBUS-GRAM5               |    6 +
 globus-rsl-dox-latex.patch |   21 -
 globus-rsl-doxygen.patch   | 1188 --------------------------------------------
 globus-rsl.spec            |   93 ++---
 sources                    |    2 +-
 6 files changed, 43 insertions(+), 1269 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index a6f8449..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /epstopdf-2.9.5gw
-/globus_rsl-7.3.tar.gz
+/*.tar.gz
diff --git a/GLOBUS-GRAM5 b/GLOBUS-GRAM5
index 44a32f6..e6e44fe 100644
--- a/GLOBUS-GRAM5
+++ b/GLOBUS-GRAM5
@@ -6,6 +6,9 @@ http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/
 Admin Guide:
 http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/admin/
 
+User's Guide
+http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/user/
+
 Developer's Guide:
 http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/developer/
 
@@ -20,3 +23,6 @@ http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/qp/
 
 Migrating Guide:
 http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/mig/
+
+Globus RPM packaging is supported by the Initiative for Globus in Europe:
+http://www.ige-project.eu/
diff --git a/globus-rsl.spec b/globus-rsl.spec
index 45f1f83..091cb3f 100644
--- a/globus-rsl.spec
+++ b/globus-rsl.spec
@@ -1,45 +1,33 @@
 %ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
 %else
-%global flavor gcc32pthr
+%global flavor gcc32
 %endif
 
 Name:		globus-rsl
 %global _name %(tr - _ <<< %{name})
-Version:	7.3
+Version:	9.1
 Release:	1%{?dist}
 Summary:	Globus Toolkit - Resource Specification Language Library
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.4/installers/src/gt5.0.4-all-source-installer.tar.bz2
-#		tar -jxf gt5.0.4-all-source-installer.tar.bz2
-#		mv gt5.0.4-all-source-installer/source-trees/gram/rsl/source globus_rsl-7.3
-#		cp -p gt5.0.4-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl-7.3
-#		tar -zcf globus_rsl-7.3.tar.gz globus_rsl-7.3
-Source:		%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-GRAM5
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source9:	epstopdf-2.9.5gw
-#		Fix doxygen markup
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7185
-Patch0:		%{name}-doxygen.patch
-#		Compiling the pdf documentation from the doxygen generated
-#		latex fails with a strange error when doxygen 1.7.4 is used:
-#		pdfTeX error (ext4): \pdfendlink ended up in different
-#		nesting level than \pdfstartlink.
-#		Making the text slightly shorter works around the problem
-Patch1:		%{name}-dox-latex.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-core%{?_isa} >= 4
+Requires:	globus-common%{?_isa} >= 14
+Provides:	globus-rsl-assist = 3
+Provides:	globus-rsl-assist%{?_isa} = 3
+Obsoletes:	globus-rsl-assist < 3
+BuildRequires:	grid-packaging-tools >= 3.4
+BuildRequires:	globus-core%{?_isa} >= 8
+BuildRequires:	globus-common-devel%{?_isa} >= 14
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 %if "%{?rhel}" == "5"
@@ -56,8 +44,11 @@ BuildRequires:	tetex-latex
 Summary:	Globus Toolkit - Resource Specification Language Library Development Files
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	globus-common-devel%{?_isa} >= 3
-Requires:	globus-core%{?_isa} >= 4
+Requires:	globus-common-devel%{?_isa} >= 14
+Requires:	globus-core%{?_isa} >= 8
+Provides:	globus-rsl-assist-devel = 3
+Provides:	globus-rsl-assist-devel%{?_isa} = 3
+Obsoletes:	globus-rsl-assist-devel < 3
 
 %package doc
 Summary:	Globus Toolkit - Resource Specification Language Library Documentation Files
@@ -66,6 +57,8 @@ Group:		Documentation
 BuildArch:	noarch
 %endif
 Requires:	%{name} = %{version}-%{release}
+Provides:	globus-rsl-assist-doc = 3
+Obsoletes:	globus-rsl-assist-doc < 3
 
 %description
 The Globus Toolkit is an open source software toolkit used for building Grid
@@ -96,8 +89,6 @@ Resource Specification Language Library Documentation Files
 
 %prep
 %setup -q -n %{_name}-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -116,18 +107,15 @@ rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
-# Remove flavor tags
-for f in `find . -name Makefile.am` ; do
-  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
-      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
-      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
-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}
 
@@ -143,32 +131,18 @@ 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
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.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
-
-# 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
+# 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
 
 # Remove unwanted documentation (needed for RHEL4)
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
 sed -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 # Install README file
 install -m 644 -p %{SOURCE8} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README
@@ -192,18 +166,21 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}
 %dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 %doc %{_docdir}/%{name}-%{version}/README
 
 %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
+* Wed Dec 14 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 9.1-1
+- Update to Globus Toolkit 5.2.0
+- Drop patch globus-rsl-doxygen.patch (fixed upstream)
+- Drop patch globus-rsl-dox-latex.patch (no longer needed)
+
 * Fri Jun 03 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.3-1
 - Update to Globus Toolkit 5.0.4
 - Fix doxygen markup
diff --git a/sources b/sources
index ffda667..9f6c768 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-7bfb89a086da379528f67cc85dcd2662  globus_rsl-7.3.tar.gz
+7414daa265fe64f9d22a195c76717bcf  globus_rsl-9.1.tar.gz
