[globus-xio/el4] Update to Globus Toolkit 5.2.0 Drop patches globus-xio-bad-age.patch, globus-xio-doxygen.patch, glob
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:19:45 UTC 2012
commit 8a9bfb71187dbf9ba27a8639f7eece832486478f
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 15:58:41 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patches globus-xio-bad-age.patch, globus-xio-doxygen.patch,
globus-xio-format.patch, globus-xio-mingw.patch and
globus-xio-type-punned-pointer.patch (fixed upstream)
.gitignore | 4 +-
GLOBUS-XIO | 3 +
globus-xio-bad-age.patch | 12 ---
globus-xio-doxygen.patch | 182 ----------------------------------
globus-xio-format.patch | 26 -----
globus-xio-mingw.patch | 57 -----------
globus-xio-type-punned-pointer.patch | 81 ---------------
globus-xio.spec | 99 ++++++-------------
sources | 2 +-
9 files changed, 35 insertions(+), 431 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 99f01e7..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-epstopdf-2.9.5gw
-globus_xio-2.8.tar.gz
+/epstopdf-2.9.5gw
+/*.tar.gz
diff --git a/GLOBUS-XIO b/GLOBUS-XIO
index a903269..19ae531 100644
--- a/GLOBUS-XIO
+++ b/GLOBUS-XIO
@@ -20,3 +20,6 @@ http://www.globus.org/toolkit/docs/latest-stable/common/xio/qp/
Migrating Guide:
http://www.globus.org/toolkit/docs/latest-stable/common/xio/mig/
+
+Globus RPM packaging is supported by the Initiative for Globus in Europe:
+http://www.ige-project.eu/
diff --git a/globus-xio.spec b/globus-xio.spec
index b734d5e..e013380 100644
--- a/globus-xio.spec
+++ b/globus-xio.spec
@@ -1,51 +1,30 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
Name: globus-xio
%global _name %(tr - _ <<< %{name})
-Version: 2.8
-Release: 4%{?dist}
+Version: 3.2
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus XIO Framework
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/xio/src globus_xio-2.8
-# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.8
-# tar -zcf globus_xio-2.8.tar.gz globus_xio-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-XIO
# 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=6585
-Patch0: %{name}-doxygen.patch
-# Bad version information:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6584
-Patch1: %{name}-bad-age.patch
-# Dereferencing of type-punned pointers:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6605
-Patch2: %{name}-type-punned-pointer.patch
-# Fixes for mingw compilation:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
-Patch3: %{name}-mingw.patch
-# Fix format errors:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6757
-Patch4: %{name}-format.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-common
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-common-devel%{?_isa} >= 4
-BuildRequires: globus-core%{?_isa} >= 4
+Requires: globus-common%{?_isa} >= 14
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-common-devel%{?_isa} >= 14
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -62,8 +41,8 @@ BuildRequires: tetex-latex
Summary: Globus Toolkit - Globus XIO Framework Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa} >= 4
-Requires: globus-core%{?_isa} >= 4
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-core%{?_isa} >= 8
%package doc
Summary: Globus Toolkit - Globus XIO Framework Documentation Files
@@ -102,11 +81,6 @@ Globus XIO Framework Documentation Files
%prep
%setup -q -n %{_name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -125,20 +99,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
-sed -e 's!\(lib[a-zA-Z_${}]*\)_${GLOBUS_FLAVOR_NAME}\.la!\1.la!g' \
- -i configure.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 +123,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_xio_driver.3 \
@@ -182,10 +141,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 +164,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> - 3.2-1
+- Update to Globus Toolkit 5.2.0
+- Drop patches globus-xio-bad-age.patch, globus-xio-doxygen.patch,
+ globus-xio-format.patch, globus-xio-mingw.patch and
+ globus-xio-type-punned-pointer.patch (fixed upstream)
+
* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-4
- Add README file
diff --git a/sources b/sources
index c43c65c..21de64b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-b53e6fdd8d3d9f2846f8ab60a7acba10 globus_xio-2.8.tar.gz
+c724eb717b61818b74535588032496be globus_xio-3.2.tar.gz
More information about the scm-commits
mailing list