[globus-gridftp-server-control/el4] Update to Globus Toolkit 5.2.0 Drop patch globus-gridftp-server-control.patch (fixed upstream)
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:21:15 UTC 2012
commit 788f48d5d34f44c5a8b17ee63902d316a9158e19
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 23:18:14 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patch globus-gridftp-server-control.patch (fixed upstream)
.gitignore | 2 +-
GLOBUS-GRIDFTP | 6 ++
globus-gridftp-server-control-deps.patch | 85 +++++++++++++++----------
globus-gridftp-server-control.patch | 14 ----
globus-gridftp-server-control.spec | 103 +++++++++++++-----------------
sources | 2 +-
6 files changed, 104 insertions(+), 108 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f6cc484..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/globus_gridftp_server_control-0.46.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-gridftp-server-control-deps.patch b/globus-gridftp-server-control-deps.patch
index 5f1227a..9a579e7 100644
--- a/globus-gridftp-server-control-deps.patch
+++ b/globus-gridftp-server-control-deps.patch
@@ -1,56 +1,73 @@
-diff -ur globus_gridftp_server_control-0.45.orig/pkgdata/pkg_data_src.gpt.in globus_gridftp_server_control-0.45/pkgdata/pkg_data_src.gpt.in
---- globus_gridftp_server_control-0.45.orig/pkgdata/pkg_data_src.gpt.in 2011-02-09 16:44:54.000000000 +0100
-+++ globus_gridftp_server_control-0.45/pkgdata/pkg_data_src.gpt.in 2011-04-25 11:00:05.517339252 +0200
-@@ -14,9 +14,6 @@
-
- <Source_Dependencies Type="compile" >
- <Dependency Name="globus_common" > <Version > <Simple_Version Major="5" /> </Version> </Dependency>
-- </Source_Dependencies>
--
-- <Source_Dependencies Type="compile" >
- <Dependency Name="globus_xio" > <Version > <Simple_Version Major="0" /> </Version> </Dependency>
- <Dependency Name="globus_xio_gsi_driver">
+diff -ur globus_gridftp_server_control-2.3.orig/pkgdata/pkg_data_src.gpt.in globus_gridftp_server_control-2.3/pkgdata/pkg_data_src.gpt.in
+--- globus_gridftp_server_control-2.3.orig/pkgdata/pkg_data_src.gpt.in 2011-12-07 00:54:51.000000000 +0100
++++ globus_gridftp_server_control-2.3/pkgdata/pkg_data_src.gpt.in 2011-12-14 19:07:16.276845737 +0100
+@@ -13,8 +13,6 @@
+ <Simple_Version Major="14"/>
+ </Version>
+ </Dependency>
+- </Source_Dependencies>
+- <Source_Dependencies Type="compile">
+ <Dependency Name="globus_xio">
<Version>
-@@ -28,9 +25,20 @@
- <Simple_Version Major="0"/>
+ <Simple_Version Major="3"/>
+@@ -30,6 +28,26 @@
+ <Simple_Version Major="2"/>
</Version>
</Dependency>
+ <Dependency Name="globus_gss_assist">
+ <Version>
-+ <Simple_Version Major="3"/>
++ <Simple_Version Major="8"/>
+ </Version>
+ </Dependency>
-+ <Dependency Name="globus_gssapi_error">
++ <Dependency Name="globus_gssapi_gsi">
++ <Version>
++ <Simple_Version Major="10"/>
++ </Version>
++ </Dependency>
++ <Dependency Name="globus_gsi_openssl_error">
+ <Version>
+ <Simple_Version Major="2"/>
+ </Version>
+ </Dependency>
- </Source_Dependencies>
-
- <Source_Dependencies Type="lib_link" >
-+ <Dependency Name="globus_common" > <Version > <Simple_Version Major="5" /> </Version> </Dependency>
- <Dependency Name="globus_xio" > <Version > <Simple_Version Major="0" /> </Version> </Dependency>
- <Dependency Name="globus_xio_gsi_driver">
++ <Dependency Name="globus_gssapi_error">
++ <Version>
++ <Simple_Version Major="4"/>
++ </Version>
++ </Dependency>
+ </Source_Dependencies>
+ <Source_Dependencies Type="lib_link">
+ <Dependency Name="globus_xio">
+@@ -47,13 +65,31 @@
+ <Simple_Version Major="2"/>
+ </Version>
+ </Dependency>
+- </Source_Dependencies>
+- <Source_Dependencies Type="lib_link">
+ <Dependency Name="globus_common">
<Version>
-@@ -42,11 +50,16 @@
- <Simple_Version Major="0"/>
+ <Simple_Version Major="14"/>
</Version>
</Dependency>
--
-- </Source_Dependencies>
--
-- <Source_Dependencies Type="lib_link" >
-- <Dependency Name="globus_common" > <Version > <Simple_Version Major="5" /> </Version> </Dependency>
+ <Dependency Name="globus_gss_assist">
+ <Version>
-+ <Simple_Version Major="3"/>
++ <Simple_Version Major="8"/>
+ </Version>
+ </Dependency>
-+ <Dependency Name="globus_gssapi_error">
++ <Dependency Name="globus_gssapi_gsi">
++ <Version>
++ <Simple_Version Major="10"/>
++ </Version>
++ </Dependency>
++ <Dependency Name="globus_gsi_openssl_error">
+ <Version>
+ <Simple_Version Major="2"/>
+ </Version>
+ </Dependency>
- </Source_Dependencies>
-
- <Build_Environment >
++ <Dependency Name="globus_gssapi_error">
++ <Version>
++ <Simple_Version Major="4"/>
++ </Version>
++ </Dependency>
+ </Source_Dependencies>
+ <Build_Environment>
+ <cflags>@GPT_PKG_CFLAGS@</cflags>
diff --git a/globus-gridftp-server-control.spec b/globus-gridftp-server-control.spec
index e9aeddd..9cf65b2 100644
--- a/globus-gridftp-server-control.spec
+++ b/globus-gridftp-server-control.spec
@@ -1,55 +1,55 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
Name: globus-gridftp-server-control
%global _name %(tr - _ <<< %{name})
-Version: 0.46
+Version: 2.3
Release: 1%{?dist}
Summary: Globus Toolkit - Globus GridFTP Server 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.4/installers/src/gt5.0.4-all-source-installer.tar.bz2
-# tar -jxf gt5.0.4-all-source-installer.tar.bz2
-# mv gt5.0.4-all-source-installer/source-trees/gridftp/server-lib/src globus_gridftp_server_control-0.46
-# cp -p gt5.0.4-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gridftp_server_control-0.46
-# tar -zcf globus_gridftp_server_control-0.46.tar.gz globus_gridftp_server_control-0.46
-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
-# MAXPATHLENGTH should not be defined in installed headers:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6829
-Patch0: %{name}.patch
-# Missing direct dependencies:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7165
-Patch1: %{name}-deps.patch
+Patch0: %{name}-deps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-xio-pipe-driver%{?_isa}
-Requires: globus-xio-gsi-driver%{?_isa}
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-xio-pipe-driver-devel%{?_isa}
-BuildRequires: globus-common-devel%{?_isa} >= 5
-BuildRequires: globus-xio-gsi-driver-devel%{?_isa}
-BuildRequires: globus-gssapi-error-devel%{?_isa}
-BuildRequires: globus-gss-assist-devel%{?_isa}
-BuildRequires: globus-xio-devel%{?_isa}
+Requires: globus-gsi-openssl-error%{?_isa} >= 2
+Requires: globus-gss-assist%{?_isa} >= 8
+Requires: globus-xio%{?_isa} >= 3
+Requires: globus-gssapi-gsi%{?_isa} >= 10
+Requires: globus-xio-pipe-driver%{?_isa} >= 2
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-xio-gsi-driver%{?_isa} >= 2
+Requires: globus-gssapi-error%{?_isa} >= 4
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-gsi-openssl-error-devel%{?_isa} >= 2
+BuildRequires: globus-gss-assist-devel%{?_isa} >= 8
+BuildRequires: globus-xio-devel%{?_isa} >= 3
+BuildRequires: globus-gssapi-gsi-devel%{?_isa} >= 10
+BuildRequires: globus-xio-pipe-driver-devel%{?_isa} >= 2
+BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: globus-xio-gsi-driver-devel%{?_isa} >= 2
+BuildRequires: globus-gssapi-error-devel%{?_isa} >= 4
%package devel
Summary: Globus Toolkit - Globus GridFTP Server Library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-xio-pipe-driver-devel%{?_isa}
-Requires: globus-common-devel%{?_isa} >= 5
-Requires: globus-xio-gsi-driver-devel%{?_isa}
-Requires: globus-gssapi-error-devel%{?_isa}
-Requires: globus-gss-assist-devel%{?_isa}
-Requires: globus-xio-devel%{?_isa}
+Requires: globus-gsi-openssl-error-devel%{?_isa} >= 2
+Requires: globus-gss-assist-devel%{?_isa} >= 8
+Requires: globus-xio-devel%{?_isa} >= 3
+Requires: globus-gssapi-gsi-devel%{?_isa} >= 10
+Requires: globus-xio-pipe-driver-devel%{?_isa} >= 2
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-xio-gsi-driver-devel%{?_isa} >= 2
+Requires: globus-gssapi-error-devel%{?_isa} >= 4
%description
The Globus Toolkit is an open source software toolkit used for building Grid
@@ -72,7 +72,6 @@ Globus GridFTP Server Library Development Files
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
-%patch1 -p1
%build
# Remove files that should be replaced during bootstrap
@@ -82,18 +81,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}
@@ -105,20 +101,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} \
@@ -127,6 +110,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
@@ -141,14 +126,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> - 2.3-1
+- Update to Globus Toolkit 5.2.0
+- Drop patch globus-gridftp-server-control.patch (fixed upstream)
+
* Sun Jun 05 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.46-1
- Update to Globus Toolkit 5.0.4
diff --git a/sources b/sources
index 093981e..d241984 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-754bbd66c133bff4a69d4b38bc41c893 globus_gridftp_server_control-0.46.tar.gz
+57a504af5fbe42160b8214e545698cb9 globus_gridftp_server_control-2.3.tar.gz
More information about the scm-commits
mailing list