[globus-gass-transfer/el4] Update to Globus Toolkit 5.2.0 Drop patch globus-gass-transfer-doxygen.patch (fixed upstream)
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:20:24 UTC 2012
commit 3ec41971b4da7bd8627d3927876a9ba2c9b33ba5
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 16:43:46 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patch globus-gass-transfer-doxygen.patch (fixed upstream)
.gitignore | 4 +-
GLOBUS-GRIDFTP | 6 +
globus-gass-transfer-deps.patch | 27 +++
globus-gass-transfer-doxygen.patch | 344 ------------------------------------
globus-gass-transfer.spec | 92 ++++------
sources | 2 +-
6 files changed, 73 insertions(+), 402 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe21e84..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-epstopdf-2.9.5gw
-globus_gass_transfer-4.3.tar.gz
+/epstopdf-2.9.5gw
+/*.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-transfer-deps.patch b/globus-gass-transfer-deps.patch
new file mode 100644
index 0000000..a048e0d
--- /dev/null
+++ b/globus-gass-transfer-deps.patch
@@ -0,0 +1,27 @@
+diff -ur globus_gass_transfer-7.1.orig/pkgdata/pkg_data_src.gpt.in globus_gass_transfer-7.1/pkgdata/pkg_data_src.gpt.in
+--- globus_gass_transfer-7.1.orig/pkgdata/pkg_data_src.gpt.in 2011-10-25 15:27:37.000000000 +0200
++++ globus_gass_transfer-7.1/pkgdata/pkg_data_src.gpt.in 2011-12-14 13:02:45.363944297 +0100
+@@ -23,6 +23,11 @@
+ <Simple_Version Major="9"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_gss_assist">
++ <Version>
++ <Simple_Version Major="8"/>
++ </Version>
++ </Dependency>
+ <Dependency Name="globus_io">
+ <Version>
+ <Simple_Version Major="8"/>
+@@ -40,6 +45,11 @@
+ <Simple_Version Major="9"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_gss_assist">
++ <Version>
++ <Simple_Version Major="8"/>
++ </Version>
++ </Dependency>
+ <Dependency Name="globus_io">
+ <Version>
+ <Simple_Version Major="8"/>
diff --git a/globus-gass-transfer.spec b/globus-gass-transfer.spec
index 435723c..b479a3c 100644
--- a/globus-gass-transfer.spec
+++ b/globus-gass-transfer.spec
@@ -1,41 +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-gass-transfer
%global _name %(tr - _ <<< %{name})
-Version: 4.3
-Release: 3%{?dist}
+Version: 7.1
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus Gass Transfer
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/transfer/source globus_gass_transfer-4.3
-# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_transfer-4.3
-# tar -zcf globus_gass_transfer-4.3.tar.gz globus_gass_transfer-4.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-GRIDFTP
# This is a workaround for the broken epstopdf script in RHEL5
# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9: epstopdf-2.9.5gw
-# Remove some doxygen warnings:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6591
-Patch0: %{name}-doxygen.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-io-devel%{?_isa} >= 3
-BuildRequires: globus-gssapi-gsi-devel%{?_isa} >= 4
-BuildRequires: globus-core%{?_isa} >= 4
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-gss-assist%{?_isa} >= 8
+Requires: globus-io%{?_isa} >= 8
+Requires: globus-gssapi-gsi%{?_isa} >= 9
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: globus-gss-assist-devel%{?_isa} >= 8
+BuildRequires: globus-io-devel%{?_isa} >= 8
+BuildRequires: globus-gssapi-gsi-devel%{?_isa} >= 9
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -52,10 +48,11 @@ BuildRequires: tetex-latex
Summary: Globus Toolkit - Globus Gass Transfer Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa} >= 3
-Requires: globus-io-devel%{?_isa} >= 3
-Requires: globus-gssapi-gsi-devel%{?_isa} >= 4
-Requires: globus-core%{?_isa} >= 4
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-gss-assist-devel%{?_isa} >= 8
+Requires: globus-io-devel%{?_isa} >= 8
+Requires: globus-gssapi-gsi-devel%{?_isa} >= 9
+Requires: globus-core%{?_isa} >= 8
%package doc
Summary: Globus Toolkit - Globus Gass Transfer Documentation Files
@@ -113,18 +110,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} --enable-doxygen
+%configure --disable-static --with-flavor=%{flavor} \
+ --enable-doxygen --with-docdir=%{_docdir}/%{name}-%{version}
+
+# Reduce overlinking
+sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
make %{?_smp_mflags}
@@ -140,32 +134,18 @@ 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
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.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
-
-# Move documentation to default RPM location
-mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
- $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-sed s!doc/%{_name}!doc/%{name}-%{version}! \
- -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
+# Move license file to main package
+grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+ >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
+sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
-i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-# 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
@@ -189,18 +169,20 @@ 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
%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Wed Dec 14 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.1-1
+- Update to Globus Toolkit 5.2.0
+- Drop patch globus-gass-transfer-doxygen.patch (fixed upstream)
+
* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.3-3
- Add README file
diff --git a/sources b/sources
index 22767d1..25951ba 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-ee7d68a6523169815422770b282a8f77 globus_gass_transfer-4.3.tar.gz
+eda8303172940daf917e2aa44318b523 globus_gass_transfer-7.1.tar.gz
More information about the scm-commits
mailing list