[globus-gram-client-tools/el4] Update to Globus Toolkit 5.2.0
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:21:39 UTC 2012
commit e4081a8207c6828b0ec2d9f9848676e4cc94f1ca
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun Jan 8 00:36:05 2012 +0100
Update to Globus Toolkit 5.2.0
.gitignore | 2 +-
GLOBUS-GRAM5 | 6 +++
globus-gram-client-tools-deps.patch | 37 +++++++++++++++++++
globus-gram-client-tools.spec | 66 +++++++++++++++++++---------------
sources | 2 +-
5 files changed, 82 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ffd5c25..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-globus_gram_client_tools-8.2.tar.gz
+/*.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-client-tools-deps.patch b/globus-gram-client-tools-deps.patch
new file mode 100644
index 0000000..342d982
--- /dev/null
+++ b/globus-gram-client-tools-deps.patch
@@ -0,0 +1,37 @@
+diff -ur globus_gram_client_tools-10.0.orig/pkgdata/pkg_data_src.gpt.in globus_gram_client_tools-10.0/pkgdata/pkg_data_src.gpt.in
+--- globus_gram_client_tools-10.0.orig/pkgdata/pkg_data_src.gpt.in 2011-08-30 02:34:07.000000000 +0200
++++ globus_gram_client_tools-10.0/pkgdata/pkg_data_src.gpt.in 2011-12-15 06:42:55.761369094 +0100
+@@ -22,6 +22,16 @@
+ <Simple_Version Major="12"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_gram_protocol">
++ <Version>
++ <Simple_Version Major="11"/>
++ </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"/>
+@@ -49,6 +59,16 @@
+ <Simple_Version Major="12"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_gram_protocol">
++ <Version>
++ <Simple_Version Major="11"/>
++ </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-gram-client-tools.spec b/globus-gram-client-tools.spec
index 40d1db8..b81d942 100644
--- a/globus-gram-client-tools.spec
+++ b/globus-gram-client-tools.spec
@@ -1,39 +1,41 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
Name: globus-gram-client-tools
%global _name %(tr - _ <<< %{name})
-Version: 8.2
-Release: 3%{?dist}
+Version: 10.0
+Release: 1%{?dist}
Summary: Globus Toolkit - Job Management Tools (globusrun)
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.2/installers/src/gt5.0.2-all-source-installer.tar.bz2
-# tar -jxf gt5.0.2-all-source-installer.tar.bz2
-# mv gt5.0.2-all-source-installer/source-trees/gram_client_tools/source globus_gram_client_tools-8.2
-# cp -p gt5.0.2-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_client_tools-8.2
-# tar -zcf globus_gram_client_tools-8.2.tar.gz globus_gram_client_tools-8.2
-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
+Patch0: %{name}-deps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-common-progs >= 3
-Requires: globus-common-setup >= 2
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-common-devel%{?_isa} >= 3
-BuildRequires: globus-rsl-assist-devel%{?_isa} >= 2
-BuildRequires: globus-gass-server-ez-devel%{?_isa} >= 2
-BuildRequires: globus-gram-client-devel%{?_isa} >= 9
-BuildRequires: globus-gss-assist-devel%{?_isa} >= 3
-BuildRequires: globus-rsl-devel%{?_isa} >= 2
-BuildRequires: globus-core%{?_isa} >= 4
+Requires: globus-gram-protocol%{?_isa} >= 11
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-gass-server-ez%{?_isa} >= 4
+Requires: globus-gram-client%{?_isa} >= 12
+Requires: globus-gss-assist%{?_isa} >= 8
+Requires: globus-rsl%{?_isa} >= 9
+Requires: globus-gass-transfer%{?_isa} >= 7
+Requires: globus-common-progs >= 14
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-gram-protocol-devel%{?_isa} >= 11
+BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: globus-gass-server-ez-devel%{?_isa} >= 4
+BuildRequires: globus-gram-client-devel%{?_isa} >= 12
+BuildRequires: globus-gss-assist-devel%{?_isa} >= 8
+BuildRequires: globus-rsl-devel%{?_isa} >= 9
+BuildRequires: globus-gass-transfer-devel%{?_isa} >= 7
%description
The Globus Toolkit is an open source software toolkit used for building Grid
@@ -46,6 +48,7 @@ Job Management Tools (globusrun)
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
%build
# Remove files that should be replaced during bootstrap
@@ -55,9 +58,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}
@@ -67,18 +76,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_doc.filelist \
- | sed -e s!^!%{_prefix}! -e 's!.*/man/.*!%doc &*!' > package.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
@@ -87,10 +93,12 @@ 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> - 10.0-1
+- Update to Globus Toolkit 5.2.0
+
* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.2-3
- Add README file
diff --git a/sources b/sources
index 270fee4..0c16347 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7aee431e7c3277d0eb2e8076c274c452 globus_gram_client_tools-8.2.tar.gz
+8b7b863df5f5a1b5964fad1cd793b0b6 globus_gram_client_tools-10.0.tar.gz
More information about the scm-commits
mailing list