[globus-ftp-control/el4] Update to Globus Toolkit 5.2.0 Drop patches globus-ftp-control-backcompat.patch, globus-ftp-control-
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:20:15 UTC 2012
commit a8a4dca0621973dc1bfd2741417bbcc525c7ae25
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 16:33:21 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patches globus-ftp-control-backcompat.patch,
globus-ftp-control-doxygen.patch, globus-ftp-control-format.patch and
globus-ftp-control-type-punned-pointer.patch (fixed upstream)
.gitignore | 2 +-
GLOBUS-GRIDFTP | 6 +
globus-ftp-control-backcompat.patch | 82 -------
globus-ftp-control-deps.patch | 37 +++
globus-ftp-control-doxygen.patch | 306 --------------------------
globus-ftp-control-format.patch | 58 -----
globus-ftp-control-type-punned-pointer.patch | 33 ---
globus-ftp-control.spec | 114 ++++------
sources | 2 +-
9 files changed, 90 insertions(+), 550 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fbf04c4..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/epstopdf-2.9.5gw
-/globus_ftp_control-2.12.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-ftp-control-deps.patch b/globus-ftp-control-deps.patch
new file mode 100644
index 0000000..625e9a1
--- /dev/null
+++ b/globus-ftp-control-deps.patch
@@ -0,0 +1,37 @@
+diff -ur globus_ftp_control-4.2.orig/pkgdata/pkg_data_src.gpt.in globus_ftp_control-4.2/pkgdata/pkg_data_src.gpt.in
+--- globus_ftp_control-4.2.orig/pkgdata/pkg_data_src.gpt.in 2011-10-25 15:27:39.000000000 +0200
++++ globus_ftp_control-4.2/pkgdata/pkg_data_src.gpt.in 2011-12-14 12:42:53.428440687 +0100
+@@ -33,6 +33,16 @@
+ <Simple_Version Major="8"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_xio">
++ <Version>
++ <Simple_Version Major="3"/>
++ </Version>
++ </Dependency>
++ <Dependency Name="globus_gssapi_error">
++ <Version>
++ <Simple_Version Major="4"/>
++ </Version>
++ </Dependency>
+ </Source_Dependencies>
+ <Source_Dependencies Type="lib_link">
+ <Dependency Name="globus_common">
+@@ -50,6 +60,16 @@
+ <Simple_Version Major="8"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_xio">
++ <Version>
++ <Simple_Version Major="3"/>
++ </Version>
++ </Dependency>
++ <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-ftp-control.spec b/globus-ftp-control.spec
index 1d46d88..d653c7c 100644
--- a/globus-ftp-control.spec
+++ b/globus-ftp-control.spec
@@ -1,51 +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-ftp-control
%global _name %(tr - _ <<< %{name})
-Version: 2.12
-Release: 2%{?dist}
+Version: 4.2
+Release: 1%{?dist}
Summary: Globus Toolkit - GridFTP Control 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/control/source globus_ftp_control-2.12
-# cp -p gt5.0.4-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_ftp_control-2.12
-# tar -zcf globus_ftp_control-2.12.tar.gz globus_ftp_control-2.12
-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=6590
-Patch0: %{name}-doxygen.patch
-# Dereferencing of type-punned pointers:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6603
-Patch1: %{name}-type-punned-pointer.patch
-# Fix format errors:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6749
-Patch2: %{name}-format.patch
-# Fix backward incompatibility
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7187
-Patch3: %{name}-backcompat.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-gss-assist-devel%{?_isa} >= 3
-BuildRequires: globus-io-devel%{?_isa} >= 6
-BuildRequires: globus-gssapi-gsi-devel%{?_isa} >= 4
-BuildRequires: globus-core%{?_isa} >= 4
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-gssapi-error%{?_isa} >= 4
+Requires: globus-xio%{?_isa} >= 3
+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-gssapi-error-devel%{?_isa} >= 4
+BuildRequires: globus-xio-devel%{?_isa} >= 3
+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"
@@ -62,11 +52,13 @@ BuildRequires: tetex-latex
Summary: Globus Toolkit - GridFTP Control Library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa} >= 3
-Requires: globus-gss-assist-devel%{?_isa} >= 3
-Requires: globus-io-devel%{?_isa} >= 6
-Requires: globus-gssapi-gsi-devel%{?_isa} >= 4
-Requires: globus-core%{?_isa} >= 4
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-gssapi-error-devel%{?_isa} >= 4
+Requires: globus-xio-devel%{?_isa} >= 3
+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 - GridFTP Control Library Documentation Files
@@ -106,9 +98,6 @@ GridFTP Control Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -127,18 +116,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}
@@ -154,22 +140,12 @@ 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
+sed '/lib.*\.la$/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
# Fix doxygen glitches
for f in $RPM_BUILD_ROOT%{_mandir}/man3/globus_ftp_control_client.c.3 \
@@ -182,10 +158,6 @@ 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
@@ -209,18 +181,22 @@ 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> - 4.2-1
+- Update to Globus Toolkit 5.2.0
+- Drop patches globus-ftp-control-backcompat.patch,
+ globus-ftp-control-doxygen.patch, globus-ftp-control-format.patch and
+ globus-ftp-control-type-punned-pointer.patch (fixed upstream)
+
* Thu Jun 23 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.12-2
- Fix backward incompatibility
diff --git a/sources b/sources
index f454caf..e72e969 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-5f3ded050d0f572c6f6af74723abf532 globus_ftp_control-2.12.tar.gz
+c6b6430bdb6caf52671018e18ed1a6e0 globus_ftp_control-4.2.tar.gz
More information about the scm-commits
mailing list