[globus-xio-pipe-driver/el4] Update to Globus Toolkit 5.2.0 Drop patch globus-xio-pipe-driver-wrong-dep.patch (fixed upstream)
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:20:05 UTC 2012
commit 475cec5f53e03742804fa0106559469076ad69d6
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 16:18:27 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patch globus-xio-pipe-driver-wrong-dep.patch (fixed upstream)
.gitignore | 2 +-
GLOBUS-XIO | 3 +
globus-xio-pipe-driver-deps.patch | 27 +++++++++++
globus-xio-pipe-driver-funcgrp.patch | 14 +++---
globus-xio-pipe-driver-wrong-dep.patch | 33 -------------
globus-xio-pipe-driver.spec | 78 +++++++++++++-------------------
sources | 2 +-
7 files changed, 71 insertions(+), 88 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 00f9ee9..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-globus_xio_pipe_driver-0.1.tar.gz
+/*.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-pipe-driver-deps.patch b/globus-xio-pipe-driver-deps.patch
new file mode 100644
index 0000000..236b3c2
--- /dev/null
+++ b/globus-xio-pipe-driver-deps.patch
@@ -0,0 +1,27 @@
+diff -ur globus_xio_pipe_driver-2.1.orig/pkgdata/pkg_data_src.gpt.in globus_xio_pipe_driver-2.1/pkgdata/pkg_data_src.gpt.in
+--- globus_xio_pipe_driver-2.1.orig/pkgdata/pkg_data_src.gpt.in 2011-12-14 08:59:59.432936804 +0100
++++ globus_xio_pipe_driver-2.1/pkgdata/pkg_data_src.gpt.in 2011-12-14 09:03:08.296491535 +0100
+@@ -7,6 +7,11 @@
+ <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
+ <src_pkg>
+ <Source_Dependencies Type="compile">
++ <Dependency Name="globus_common">
++ <Version>
++ <Simple_Version Major="14"/>
++ </Version>
++ </Dependency>
+ <Dependency Name="globus_xio">
+ <Version>
+ <Simple_Version Major="3"/>
+@@ -14,6 +19,11 @@
+ </Dependency>
+ </Source_Dependencies>
+ <Source_Dependencies Type="lib_link">
++ <Dependency Name="globus_common">
++ <Version>
++ <Simple_Version Major="14"/>
++ </Version>
++ </Dependency>
+ <Dependency Name="globus_xio">
+ <Version>
+ <Simple_Version Major="3"/>
diff --git a/globus-xio-pipe-driver-funcgrp.patch b/globus-xio-pipe-driver-funcgrp.patch
index 07efcd2..988cf64 100644
--- a/globus-xio-pipe-driver-funcgrp.patch
+++ b/globus-xio-pipe-driver-funcgrp.patch
@@ -1,11 +1,11 @@
-diff -ur globus_xio_pipe_driver-0.1.orig/pkgdata/pkg_data_src.gpt.in globus_xio_pipe_driver-0.1/pkgdata/pkg_data_src.gpt.in
---- globus_xio_pipe_driver-0.1.orig/pkgdata/pkg_data_src.gpt.in 2009-05-15 03:13:39.000000000 +0200
-+++ globus_xio_pipe_driver-0.1/pkgdata/pkg_data_src.gpt.in 2011-04-25 07:21:58.813045941 +0200
-@@ -5,6 +5,7 @@
-
- <Aging_Version Major="0" Minor="1" Age="0"/>
+diff -ur globus_xio_pipe_driver-2.1.orig/pkgdata/pkg_data_src.gpt.in globus_xio_pipe_driver-2.1/pkgdata/pkg_data_src.gpt.in
+--- globus_xio_pipe_driver-2.1.orig/pkgdata/pkg_data_src.gpt.in 2011-10-25 15:27:45.000000000 +0200
++++ globus_xio_pipe_driver-2.1/pkgdata/pkg_data_src.gpt.in 2011-12-11 19:57:31.532992046 +0100
+@@ -3,6 +3,7 @@
+ <gpt_package_metadata Name="globus_xio_pipe_driver" Format_Version="0.01">
+ <Aging_Version Major="2" Minor="1" Age="2"/>
<Description> Globus Pipe Driver</Description>
+ <Functional_Group>Communication</Functional_Group>
<Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
-
<src_pkg>
+ <Source_Dependencies Type="compile">
diff --git a/globus-xio-pipe-driver.spec b/globus-xio-pipe-driver.spec
index 1d966bd..1c1a2da 100644
--- a/globus-xio-pipe-driver.spec
+++ b/globus-xio-pipe-driver.spec
@@ -1,44 +1,38 @@
%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-pipe-driver
%global _name %(tr - _ <<< %{name})
-Version: 0.1
-Release: 3%{?dist}
+Version: 2.1
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus Pipe Driver
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/drivers/pipe/source globus_xio_pipe_driver-0.1
-# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_pipe_driver-0.1
-# tar -zcf globus_xio_pipe_driver-0.1.tar.gz globus_xio_pipe_driver-0.1
-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
-# Wrong dependency information:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6950
-Patch0: %{name}-wrong-dep.patch
-# Missing functional group:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7167
-Patch1: %{name}-funcgrp.patch
+Patch0: %{name}-funcgrp.patch
+Patch1: %{name}-deps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-common
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-xio-devel%{?_isa}
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-xio%{?_isa} >= 3
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: globus-xio-devel%{?_isa} >= 3
%package devel
Summary: Globus Toolkit - Globus Pipe Driver Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-xio-devel%{?_isa}
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-xio-devel%{?_isa} >= 3
%description
The Globus Toolkit is an open source software toolkit used for building Grid
@@ -71,18 +65,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}
@@ -94,23 +85,14 @@ GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
# This library is opened using lt_dlopenext, so the libtool archive
# (.la file) can not be removed - fix the libdir and clear dependency_libs
+# ... and move it to the main package
for lib in `find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
sed -e "s!^libdir=.*!libdir=\'%{_libdir}\'!" \
-e "s!^dependency_libs=.*!dependency_libs=\'\'!" -i $lib
done
-
-# 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}
+grep 'lib.*\.la$' $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
+ >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
# Install README file
install -m 644 -p %{SOURCE8} \
@@ -119,6 +101,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
@@ -133,14 +117,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.1-1
+- Update to Globus Toolkit 5.2.0
+- Drop patch globus-xio-pipe-driver-wrong-dep.patch (fixed upstream)
+
* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.1-3
- Add README file
- Clear dependency libs in .la file
diff --git a/sources b/sources
index 0f169ef..5cc35eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c4ca2513d58d7560388c77d450cd415 globus_xio_pipe_driver-0.1.tar.gz
+6ea8b9e874615b2ad8d010392537ee4d globus_xio_pipe_driver-2.1.tar.gz
More information about the scm-commits
mailing list