[globus-usage/el4] Update to Globus Toolkit 5.2.0 Drop patch globus-usage-deps.patch (fixed upstream)
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:20:41 UTC 2012
commit fa8bf6081a2cee140514bf2d846a5e5d0786cd7a
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 16:58:29 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patch globus-usage-deps.patch (fixed upstream)
.gitignore | 2 +-
GLOBUS-CCOMMONLIB | 3 ++
globus-usage-deps.patch | 27 ----------------
globus-usage.spec | 77 +++++++++++++++++------------------------------
sources | 2 +-
5 files changed, 33 insertions(+), 78 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bea5da7..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/globus_usage-1.4.tar.gz
+/*.tar.gz
diff --git a/GLOBUS-CCOMMONLIB b/GLOBUS-CCOMMONLIB
index b9cbdac..46b1fc0 100644
--- a/GLOBUS-CCOMMONLIB
+++ b/GLOBUS-CCOMMONLIB
@@ -20,3 +20,6 @@ http://www.globus.org/toolkit/docs/latest-stable/common/ccommonlib/qp/
Migrating Guide:
http://www.globus.org/toolkit/docs/latest-stable/common/ccommonlib/mig/
+
+Globus RPM packaging is supported by the Initiative for Globus in Europe:
+http://www.ige-project.eu/
diff --git a/globus-usage.spec b/globus-usage.spec
index 01d95bc..8a0202c 100644
--- a/globus-usage.spec
+++ b/globus-usage.spec
@@ -1,45 +1,37 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
Name: globus-usage
%global _name %(tr - _ <<< %{name})
-Version: 1.4
-Release: 2%{?dist}
+Version: 3.1
+Release: 1%{?dist}
Summary: Globus Toolkit - Usage 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.3/installers/src/gt5.0.3-all-source-installer.tar.bz2
-# tar -jxf gt5.0.3-all-source-installer.tar.bz2
-# mv gt5.0.3-all-source-installer/source-trees/usage/c/sender/source globus_usage-1.4
-# cp -p gt5.0.3-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_usage-1.4
-# tar -zcf globus_usage-1.4.tar.gz globus_usage-1.4
-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-CCOMMONLIB
-# Missing direct dependencies:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7165
-Patch0: %{name}-deps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-common
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-common-devel%{?_isa}
-BuildRequires: globus-xio-devel%{?_isa}
-BuildRequires: globus-core%{?_isa} >= 4
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-xio%{?_isa} >= 3
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: globus-xio-devel%{?_isa} >= 3
%package devel
Summary: Globus Toolkit - Usage Library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa}
-Requires: globus-xio-devel%{?_isa}
-Requires: globus-core%{?_isa} >= 4
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-xio-devel%{?_isa} >= 3
+Requires: globus-core%{?_isa} >= 8
%description
The Globus Toolkit is an open source software toolkit used for building Grid
@@ -62,7 +54,6 @@ Usage Library Development Files
%prep
%setup -q -n %{_name}-%{version}
-%patch0 -p1
%build
# Remove files that should be replaced during bootstrap
@@ -72,18 +63,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}
@@ -95,20 +83,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} \
@@ -117,6 +92,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
@@ -131,14 +108,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> - 3.1-1
+- Update to Globus Toolkit 5.2.0
+- Drop patch globus-usage-deps.patch (fixed upstream)
+
* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.4-2
- Add README file
- Add missing dependencies
diff --git a/sources b/sources
index 3794e16..c32f522 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4ef36df672fbd46ae99d0238d62d74e globus_usage-1.4.tar.gz
+50937fc29870c49723fc19e2699f211c globus_usage-3.1.tar.gz
More information about the scm-commits
mailing list