[globus-io/el4] Update to Globus Toolkit 5.2.0 Drop patch globus-io-parens.patch (fixed upstream)
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:20:10 UTC 2012
commit 71588a7c3e15277f9d79487b64ba08fccfbef2bf
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 16:26:07 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patch globus-io-parens.patch (fixed upstream)
.gitignore | 2 +-
GLOBUS-XIO | 3 +
globus-io-deps.patch | 46 +++++++++++++---------
globus-io-parens.patch | 12 ------
globus-io.spec | 98 ++++++++++++++++++++---------------------------
sources | 2 +-
6 files changed, 74 insertions(+), 89 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 28b481b..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-globus_io-6.3.tar.gz
+/*.tar.gz
diff --git a/GLOBUS-XIO b/GLOBUS-XIO
index a903269..19ae531 100644
--- a/GLOBUS-XIO
+++ b/GLOBUS-XIO
@@ -20,3 +20,6 @@ http://www.globus.org/toolkit/docs/latest-stable/common/xio/qp/
Migrating Guide:
http://www.globus.org/toolkit/docs/latest-stable/common/xio/mig/
+
+Globus RPM packaging is supported by the Initiative for Globus in Europe:
+http://www.ige-project.eu/
diff --git a/globus-io-deps.patch b/globus-io-deps.patch
index 5942ac2..84c6538 100644
--- a/globus-io-deps.patch
+++ b/globus-io-deps.patch
@@ -1,19 +1,27 @@
-diff -ur globus_io-6.3.orig/pkgdata/pkg_data_src.gpt.in globus_io-6.3/pkgdata/pkg_data_src.gpt.in
---- globus_io-6.3.orig/pkgdata/pkg_data_src.gpt.in 2007-01-03 21:26:57.000000000 +0100
-+++ globus_io-6.3/pkgdata/pkg_data_src.gpt.in 2011-04-25 07:40:42.498899469 +0200
-@@ -12,6 +12,7 @@
-
- <Source_Dependencies Type="compile" >
- <Dependency Name="globus_core"><Version><Simple_Version Major="4"></Simple_Version></Version></Dependency>
-+ <Dependency Name="globus_common"><Version><Simple_Version Major="0"></Simple_Version></Version></Dependency>
- <Dependency Name="globus_xio"><Version><Simple_Version Major="0"></Simple_Version></Version></Dependency>
- <Dependency Name="globus_gss_assist"><Version><Simple_Version Major="3"></Simple_Version></Version></Dependency>
-
-@@ -25,6 +26,7 @@
- </Source_Dependencies>
-
- <Source_Dependencies Type="lib_link" >
-+ <Dependency Name="globus_common"><Version><Simple_Version Major="0"></Simple_Version></Version></Dependency>
- <Dependency Name="globus_xio"><Version><Simple_Version Major="0"></Simple_Version></Version></Dependency>
- <Dependency Name="globus_gss_assist"><Version><Simple_Version Major="3"></Simple_Version></Version></Dependency>
-
+diff -ur globus_io-9.2.orig/pkgdata/pkg_data_src.gpt.in globus_io-9.2/pkgdata/pkg_data_src.gpt.in
+--- globus_io-9.2.orig/pkgdata/pkg_data_src.gpt.in 2011-12-01 21:52:25.000000000 +0100
++++ globus_io-9.2/pkgdata/pkg_data_src.gpt.in 2011-12-14 09:22:14.728572795 +0100
+@@ -37,6 +37,11 @@
+ <Simple_Version Major="2"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_gssapi_error">
++ <Version>
++ <Simple_Version Major="4"/>
++ </Version>
++ </Dependency>
+ </Source_Dependencies>
+ <Source_Dependencies Type="lib_link">
+ <Dependency Name="globus_common">
+@@ -64,6 +69,11 @@
+ <Simple_Version Major="2"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_gssapi_error">
++ <Version>
++ <Simple_Version Major="4"/>
++ </Version>
++ </Dependency>
+ </Source_Dependencies>
+ <With_Flavors ColocateLibraries="no" build="yes"/>
+ <Build_Environment>
diff --git a/globus-io.spec b/globus-io.spec
index 203cf3a..6eadcb5 100644
--- a/globus-io.spec
+++ b/globus-io.spec
@@ -1,52 +1,51 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
Name: globus-io
%global _name %(tr - _ <<< %{name})
-Version: 6.3
-Release: 6%{?dist}
+Version: 9.2
+Release: 1%{?dist}
Summary: Globus Toolkit - uniform I/O interface
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.0/installers/src/gt5.0.0-all-source-installer.tar.bz2
-# tar -jxf gt5.0.0-all-source-installer.tar.bz2
-# mv gt5.0.0-all-source-installer/source-trees/io/compat globus_io-6.3
-# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_io-6.3
-# tar -zcf globus_io-6.3.tar.gz globus_io-6.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-XIO
-# Fix suggest parentheses compiler warning:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6758
-Patch0: %{name}-parens.patch
-# Missing direct dependencies:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7165
-Patch1: %{name}-deps.patch
+Patch0: %{name}-deps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-xio-gsi-driver%{?_isa}
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-common-devel%{?_isa}
-BuildRequires: globus-xio-gsi-driver-devel%{?_isa}
-BuildRequires: globus-gss-assist-devel%{?_isa} >= 3
-BuildRequires: globus-xio-devel%{?_isa}
-BuildRequires: globus-core%{?_isa} >= 4
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-xio-gsi-driver%{?_isa} >= 2
+Requires: globus-gssapi-error%{?_isa} >= 4
+Requires: globus-gss-assist%{?_isa} >= 8
+Requires: globus-xio%{?_isa} >= 3
+Requires: globus-gssapi-gsi%{?_isa} >= 10
+Requires: globus-xio-gsi-driver%{?_isa} >= 2
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: globus-xio-gsi-driver-devel%{?_isa} >= 2
+BuildRequires: globus-gssapi-error-devel%{?_isa} >= 4
+BuildRequires: globus-gss-assist-devel%{?_isa} >= 8
+BuildRequires: globus-xio-devel%{?_isa} >= 3
+BuildRequires: globus-gssapi-gsi-devel%{?_isa} >= 10
%package devel
Summary: Globus Toolkit - uniform I/O interface Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa}
-Requires: globus-xio-gsi-driver-devel%{?_isa}
-Requires: globus-gss-assist-devel%{?_isa} >= 3
-Requires: globus-xio-devel%{?_isa}
-Requires: globus-core%{?_isa} >= 4
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-xio-gsi-driver-devel%{?_isa} >= 2
+Requires: globus-gssapi-error-devel%{?_isa} >= 4
+Requires: globus-gss-assist-devel%{?_isa} >= 8
+Requires: globus-xio-devel%{?_isa} >= 3
+Requires: globus-gssapi-gsi-devel%{?_isa} >= 10
+Requires: globus-core%{?_isa} >= 8
%description
The Globus Toolkit is an open source software toolkit used for building Grid
@@ -69,7 +68,6 @@ uniform I/O interface Development Files
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
-%patch1 -p1
%build
# Remove files that should be replaced during bootstrap
@@ -79,18 +77,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}
+%configure --disable-static --with-flavor=%{flavor} \
+ --with-docdir=%{_docdir}/%{name}-%{version}
+
+# Reduce overlinking
+sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
make %{?_smp_mflags}
@@ -102,20 +97,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
-
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
# Install README file
install -m 644 -p %{SOURCE8} \
@@ -124,6 +106,8 @@ install -m 644 -p %{SOURCE8} \
# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
| sed s!^!%{_prefix}! > package.filelist
+cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' >> package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
| sed s!^!%{_prefix}! > package-devel.filelist
@@ -138,14 +122,16 @@ 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
%changelog
+* Wed Dec 14 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 9.2-1
+- Update to Globus Toolkit 5.2.0
+- Drop patch globus-io-parens.patch (fixed upstream)
+
* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.3-6
- Add README file
- Add missing dependencies
diff --git a/sources b/sources
index 18c7b00..c79c59a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e06211309ef66bd02865c29330828a6 globus_io-6.3.tar.gz
+2a07659ce0004249d3d293164f7594f1 globus_io-9.2.tar.gz
More information about the scm-commits
mailing list