[globus-gram-protocol/el4: 3/3] Update to Globus Toolkit 5.2.0 Dropped patches globus-gram-protocol.patch and globus-gram-protocol-d
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:21:30 UTC 2012
commit 8624370270e0c0097521bf45a6dc8760f3936ee1
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 23:47:16 2012 +0100
Update to Globus Toolkit 5.2.0
Dropped patches globus-gram-protocol.patch and
globus-gram-protocol-doxygen.patch (fixed upstream)
.gitignore | 4 +-
GLOBUS-GRAM5 | 6 +
globus-gram-protocol-deps.patch | 37 ++
globus-gram-protocol-doxygen.patch | 759 ------------------------------------
globus-gram-protocol.patch | 73 ----
globus-gram-protocol.spec | 99 ++---
sources | 2 +-
7 files changed, 86 insertions(+), 894 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index edb1bee..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-epstopdf-2.9.5gw
-globus_gram_protocol-9.7.tar.gz
+/epstopdf-2.9.5gw
+/*.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-gram-protocol-deps.patch b/globus-gram-protocol-deps.patch
new file mode 100644
index 0000000..8e424f5
--- /dev/null
+++ b/globus-gram-protocol-deps.patch
@@ -0,0 +1,37 @@
+diff -ur globus_gram_protocol-11.2.orig/pkgdata/pkg_data_src.gpt.in globus_gram_protocol-11.2/pkgdata/pkg_data_src.gpt.in
+--- globus_gram_protocol-11.2.orig/pkgdata/pkg_data_src.gpt.in 2011-11-15 21:15:16.000000000 +0100
++++ globus_gram_protocol-11.2/pkgdata/pkg_data_src.gpt.in 2011-12-15 04:59:14.568351352 +0100
+@@ -23,6 +23,16 @@
+ <Simple_Version Major="8"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_gssapi_gsi">
++ <Version>
++ <Simple_Version Major="10"/>
++ </Version>
++ </Dependency>
++ <Dependency Name="globus_gss_assist">
++ <Version>
++ <Simple_Version Major="8"/>
++ </Version>
++ </Dependency>
+ </Source_Dependencies>
+ <Source_Dependencies Type="lib_link">
+ <Dependency Name="globus_common">
+@@ -34,6 +44,16 @@
+ <Version>
+ <Simple_Version Major="8"/>
+ </Version>
++ </Dependency>
++ <Dependency Name="globus_gssapi_gsi">
++ <Version>
++ <Simple_Version Major="10"/>
++ </Version>
++ </Dependency>
++ <Dependency Name="globus_gss_assist">
++ <Version>
++ <Simple_Version Major="8"/>
++ </Version>
+ </Dependency>
+ </Source_Dependencies>
+ <Source_Dependencies Type="doc_runtime">
diff --git a/globus-gram-protocol.spec b/globus-gram-protocol.spec
index cac584a..280197b 100644
--- a/globus-gram-protocol.spec
+++ b/globus-gram-protocol.spec
@@ -1,47 +1,41 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
%{!?perl_vendorlib: %global perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
Name: globus-gram-protocol
%global _name %(tr - _ <<< %{name})
-Version: 9.7
-Release: 8%{?dist}
+Version: 11.2
+Release: 1%{?dist}
Summary: Globus Toolkit - GRAM Protocol 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.1/installers/src/gt5.0.1-all-source-installer.tar.bz2
-# tar -jxf gt5.0.1-all-source-installer.tar.bz2
-# mv gt5.0.1-all-source-installer/source-trees/gram/protocol/source globus_gram_protocol-9.7
-# cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_protocol-9.7
-# tar -zcf globus_gram_protocol-9.7.tar.gz globus_gram_protocol-9.7
-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
-# Fixes for FHS installation:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6815
-Patch0: %{name}.patch
-# Fix doxygen markup
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7185
-Patch1: %{name}-doxygen.patch
+Patch0: %{name}-deps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-common
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-gss-assist%{?_isa} >= 8
+Requires: globus-gssapi-gsi%{?_isa} >= 10
+Requires: globus-io%{?_isa} >= 8
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-common-devel%{?_isa} >= 3
-BuildRequires: globus-io-devel%{?_isa} >= 3
-BuildRequires: globus-core%{?_isa} >= 4
-BuildRequires: globus-common-doc >= 3
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: globus-gss-assist-devel%{?_isa} >= 8
+BuildRequires: globus-gssapi-gsi-devel%{?_isa} >= 10
+BuildRequires: globus-io-devel%{?_isa} >= 8
+BuildRequires: globus-common-doc >= 14
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -58,9 +52,11 @@ BuildRequires: tetex-latex
Summary: Globus Toolkit - GRAM Protocol Library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa} >= 3
-Requires: globus-io-devel%{?_isa} >= 3
-Requires: globus-core%{?_isa} >= 4
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-gss-assist-devel%{?_isa} >= 8
+Requires: globus-gssapi-gsi-devel%{?_isa} >= 10
+Requires: globus-io-devel%{?_isa} >= 8
+Requires: globus-core%{?_isa} >= 8
%package doc
Summary: Globus Toolkit - GRAM Protocol Library Documentation Files
@@ -100,7 +96,6 @@ GRAM Protocol Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
-%patch1 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -119,18 +114,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}
@@ -149,39 +141,25 @@ chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gram-protocol-constants.sh
# 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
# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
- $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
+ $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
| sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
| sed s!^!%{_prefix}! > package-devel.filelist
@@ -201,12 +179,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
%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,-)
@@ -216,6 +192,11 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM
%changelog
+* Wed Dec 14 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 11.2-1
+- Update to Globus Toolkit 5.2.0
+- Dropped patches globus-gram-protocol.patch and
+ globus-gram-protocol-doxygen.patch (fixed upstream)
+
* Fri Jun 17 2011 Marcela Mašláňová <mmaslano at redhat.com> - 9.7-8
- Perl mass rebuild
diff --git a/sources b/sources
index ae37e8b..7c0572a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-77060fb6876f2a22873f5be7f0893d06 globus_gram_protocol-9.7.tar.gz
+408656d74ad786f628aeef95d0db2811 globus_gram_protocol-11.2.tar.gz
More information about the scm-commits
mailing list