[globus-gass-cache-program/el4] Update to Globus Toolkit 5.2.0 Drop patch globus-gass-cache-program.patch (fixed upstream)
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:21:50 UTC 2012
commit 51c601a1cb54c99adc2ee9364a3bed95222eb52c
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun Jan 8 00:47:38 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patch globus-gass-cache-program.patch (fixed upstream)
.gitignore | 2 +-
GLOBUS-GRIDFTP | 6 +++
globus-gass-cache-program-deps.patch | 15 ++++++++
globus-gass-cache-program.patch | 57 -------------------------------
globus-gass-cache-program.spec | 62 ++++++++++++++++++----------------
sources | 2 +-
6 files changed, 56 insertions(+), 88 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c53c39c..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-globus_gass_cache_program-2.8.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-program-deps.patch b/globus-gass-cache-program-deps.patch
new file mode 100644
index 0000000..14d0155
--- /dev/null
+++ b/globus-gass-cache-program-deps.patch
@@ -0,0 +1,15 @@
+diff -ur globus_gass_cache_program-5.0.orig/pkgdata/pkg_data_src.gpt.in globus_gass_cache_program-5.0/pkgdata/pkg_data_src.gpt.in
+--- globus_gass_cache_program-5.0.orig/pkgdata/pkg_data_src.gpt.in 2011-08-30 02:34:01.000000000 +0200
++++ globus_gass_cache_program-5.0/pkgdata/pkg_data_src.gpt.in 2011-12-15 06:57:43.181795085 +0100
+@@ -28,6 +28,11 @@
+ <Simple_Version Major="8"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_gass_transfer">
++ <Version>
++ <Simple_Version Major="7"/>
++ </Version>
++ </Dependency>
+ <Dependency Name="globus_gass_server_ez">
+ <Version>
+ <Simple_Version Major="4"/>
diff --git a/globus-gass-cache-program.spec b/globus-gass-cache-program.spec
index 1622abb..ccc819a 100644
--- a/globus-gass-cache-program.spec
+++ b/globus-gass-cache-program.spec
@@ -1,40 +1,38 @@
%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-program
%global _name %(tr - _ <<< %{name})
-Version: 2.8
-Release: 3%{?dist}
+Version: 5.0
+Release: 1%{?dist}
Summary: Globus Toolkit - Tools to manipulate local and remote GASS caches
Group: Applications/Internet
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_program/source globus_gass_cache_program-2.8
-# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_cache_program-2.8
-# tar -zcf globus_gass_cache_program-2.8.tar.gz globus_gass_cache_program-2.8
-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
-# Fixes for FHS installation:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6818
-Patch0: %{name}.patch
+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} >= 3
-BuildRequires: globus-gram-client-devel%{?_isa} >= 3
-BuildRequires: globus-gass-server-ez-devel%{?_isa} >= 2
-BuildRequires: globus-gass-copy-devel%{?_isa} >= 5
-BuildRequires: globus-gass-cache-devel%{?_isa} >= 5
-BuildRequires: globus-core%{?_isa} >= 4
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-gram-client%{?_isa} >= 12
+Requires: globus-gass-server-ez%{?_isa} >= 4
+Requires: globus-gass-copy%{?_isa} >= 8
+Requires: globus-gass-cache%{?_isa} >= 8
+Requires: globus-gass-transfer%{?_isa} >= 7
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: globus-gram-client-devel%{?_isa} >= 12
+BuildRequires: globus-gass-server-ez-devel%{?_isa} >= 4
+BuildRequires: globus-gass-copy-devel%{?_isa} >= 8
+BuildRequires: globus-gass-cache-devel%{?_isa} >= 8
+BuildRequires: globus-gass-transfer-devel%{?_isa} >= 7
%description
The Globus Toolkit is an open source software toolkit used for building Grid
@@ -57,9 +55,15 @@ rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
+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}
@@ -69,18 +73,15 @@ make install DESTDIR=$RPM_BUILD_ROOT
GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
-# 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}_pgm.filelist \
- $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
| sed s!^!%{_prefix}! > package.filelist
+cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' >> package.filelist
%clean
rm -rf $RPM_BUILD_ROOT
@@ -89,10 +90,13 @@ 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
%changelog
+* Thu Dec 15 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
+- Update to Globus Toolkit 5.2.0
+- Drop patch globus-gass-cache-program.patch (fixed upstream)
+
* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-3
- Add README file
diff --git a/sources b/sources
index 33ec784..3f3fced 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b062b5dd1326518256d48fbe1918d5ae globus_gass_cache_program-2.8.tar.gz
+f4cbb4b80cde57a831b2fa94a5213896 globus_gass_cache_program-5.0.tar.gz
More information about the scm-commits
mailing list