[globus-gass-cache/el4] Update to Globus Toolkit 5.2.0 Drop patch globus-gass-cache.patch (fixed upstream)
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:21:45 UTC 2012
commit 232652f0e18e71bbeffc16ba51320619b4fb6fd1
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun Jan 8 00:41:01 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patch globus-gass-cache.patch (fixed upstream)
.gitignore | 2 +-
GLOBUS-GRIDFTP | 6 ++++
globus-gass-cache.patch | 28 -----------------
globus-gass-cache.spec | 76 ++++++++++++++++------------------------------
sources | 2 +-
5 files changed, 35 insertions(+), 79 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 915d085..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-globus_gass_cache-5.4.tar.gz
+/*.tar.gz
diff --git a/GLOBUS-GRIDFTP b/GLOBUS-GRIDFTP
index 99cac0a..9d3be67 100644
--- a/GLOBUS-GRIDFTP
+++ b/GLOBUS-GRIDFTP
@@ -6,6 +6,9 @@ http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/
Admin Guide:
http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/admin/
+User's Guide:
+http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/user/
+
Developer's Guide:
http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/developer/
@@ -20,3 +23,6 @@ http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/qp/
Migrating Guide:
http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/mig/
+
+Globus RPM packaging is supported by the Initiative for Globus in Europe:
+http://www.ige-project.eu/
diff --git a/globus-gass-cache.spec b/globus-gass-cache.spec
index aa2d963..45cd826 100644
--- a/globus-gass-cache.spec
+++ b/globus-gass-cache.spec
@@ -1,45 +1,36 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
Name: globus-gass-cache
%global _name %(tr - _ <<< %{name})
-Version: 5.4
-Release: 4%{?dist}
+Version: 8.1
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus Gass Cache
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/gass/cache/source globus_gass_cache-5.4
-# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_cache-5.4
-# tar -zcf globus_gass_cache-5.4.tar.gz globus_gass_cache-5.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-GRIDFTP
-# PATH_MAX should not be defined in installed headers:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6827
-Patch0: %{name}.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-openssl%{?_isa} >= 1
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-common-devel%{?_isa} >= 3
-BuildRequires: globus-openssl-devel%{?_isa} >= 1
-BuildRequires: globus-core%{?_isa} >= 4
+Requires: globus-common%{?_isa} >= 14
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: openssl-devel%{?_isa}
%package devel
Summary: Globus Toolkit - Globus Gass Cache Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa} >= 3
-Requires: globus-openssl-devel%{?_isa} >= 1
-Requires: globus-core%{?_isa} >= 4
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-core%{?_isa} >= 8
+Requires: openssl-devel%{?_isa}
%description
The Globus Toolkit is an open source software toolkit used for building Grid
@@ -61,7 +52,6 @@ Globus Gass Cache Development Files
%prep
%setup -q -n %{_name}-%{version}
-%patch0 -p1
%build
# Remove files that should be replaced during bootstrap
@@ -71,18 +61,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}
@@ -94,20 +81,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} \
@@ -116,6 +90,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
@@ -130,14 +106,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
+* Thu Dec 15 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.1-1
+- Update to Globus Toolkit 5.2.0
+- Drop patch globus-gass-cache.patch (fixed upstream)
+
* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.4-4
- Add README file
diff --git a/sources b/sources
index 874eb35..9a41f86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-977e9e652af1fe7931326259f1a2f8f0 globus_gass_cache-5.4.tar.gz
+5c20753ee005985db1f26198e324cc58 globus_gass_cache-8.1.tar.gz
More information about the scm-commits
mailing list