[globus-xio-gsi-driver/el4] Update to Globus Toolkit 5.2.0 Drop patches globus-xio-gsi-driver-deps.patch, globus-xio-gsi-driver-
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:19:54 UTC 2012
commit 3e7f68b0f99087b04edff2a152ca1d0079568ce9
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 16:09:59 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patches globus-xio-gsi-driver-deps.patch,
globus-xio-gsi-driver-funcgrp.patch,
globus-xio-gsi-driver-type-punned-pointer.patch and
globus-xio-gsi-driver-wrong-dep.patch (fixed upstream)
.gitignore | 4 +-
GLOBUS-XIO | 3 +
globus-xio-gsi-driver-deps.patch | 23 -----
globus-xio-gsi-driver-doxygen.patch | 31 ++++--
globus-xio-gsi-driver-funcgrp.patch | 11 --
globus-xio-gsi-driver-type-punned-pointer.patch | 42 --------
globus-xio-gsi-driver-wrong-dep.patch | 18 ----
globus-xio-gsi-driver.spec | 122 +++++++++--------------
sources | 2 +-
9 files changed, 73 insertions(+), 183 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9a9e10..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-epstopdf-2.9.5gw
-globus_xio_gsi_driver-0.6.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-gsi-driver-doxygen.patch b/globus-xio-gsi-driver-doxygen.patch
index 8783229..95b7648 100644
--- a/globus-xio-gsi-driver-doxygen.patch
+++ b/globus-xio-gsi-driver-doxygen.patch
@@ -1,12 +1,23 @@
-diff -ur globus_xio_gsi_driver-0.6.orig/configure.in globus_xio_gsi_driver-0.6/configure.in
---- globus_xio_gsi_driver-0.6.orig/configure.in 2006-04-21 21:10:34.000000000 +0200
-+++ globus_xio_gsi_driver-0.6/configure.in 2008-10-21 07:12:14.000000000 +0200
-@@ -12,7 +12,7 @@
- dnl Initialize the automake rules the last argument
- AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
+diff -ur globus_xio_gsi_driver-2.1.orig/globus_xio_gsi.h globus_xio_gsi_driver-2.1/globus_xio_gsi.h
+--- globus_xio_gsi_driver-2.1.orig/globus_xio_gsi.h 2011-03-08 17:19:47.000000000 +0100
++++ globus_xio_gsi_driver-2.1/globus_xio_gsi.h 2012-01-05 05:35:27.376342351 +0100
+@@ -14,6 +14,9 @@
+ * limitations under the License.
+ */
--LAC_DOXYGEN("../", "", "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
-+LAC_DOXYGEN("../", "", "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
-
- GLOBUS_FINALIZE
++#ifndef GLOBUS_XIO_GSI_DRIVER_INCLUDE
++#define GLOBUS_XIO_GSI_DRIVER_INCLUDE
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_xio_gsi.h
+@@ -25,9 +28,6 @@
+ */
+ #endif
+-#ifndef GLOBUS_XIO_GSI_DRIVER_INCLUDE
+-#define GLOBUS_XIO_GSI_DRIVER_INCLUDE
+-
+ #ifndef EXTERN_C_BEGIN
+ # ifdef __cplusplus
+ # define EXTERN_C_BEGIN extern "C" {
diff --git a/globus-xio-gsi-driver.spec b/globus-xio-gsi-driver.spec
index eaef285..9c36524 100644
--- a/globus-xio-gsi-driver.spec
+++ b/globus-xio-gsi-driver.spec
@@ -1,55 +1,40 @@
%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-gsi-driver
%global _name %(tr - _ <<< %{name})
-Version: 0.6
-Release: 7%{?dist}
+Version: 2.1
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus XIO GSI 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.1/installers/src/gt5.0.1-all-source-installer.tar.bz2
-# tar -jxf gt5.0.1-all-source-installer.tar.bz2
-# mv gt5.0.1-all-source-installer/source-trees/xio/drivers/gsi globus_xio_gsi_driver-0.6
-# cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_gsi_driver-0.6
-# tar -zcf globus_xio_gsi_driver-0.6.tar.gz globus_xio_gsi_driver-0.6
-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
-# Fix wrong dependency type:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6586
-Patch0: %{name}-wrong-dep.patch
-# Remove some doxygen warnings:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6587
-Patch1: %{name}-doxygen.patch
-# Dereferencing of type-punned pointers:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6606
-Patch2: %{name}-type-punned-pointer.patch
-# Missing direct dependencies:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7165
-Patch3: %{name}-deps.patch
-# Missing functional group:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7167
-Patch4: %{name}-funcgrp.patch
+Patch0: %{name}-doxygen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-common
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-common-devel%{?_isa}
-BuildRequires: globus-gssapi-error-devel%{?_isa} >= 2
-BuildRequires: globus-gss-assist-devel%{?_isa} >= 3
-BuildRequires: globus-xio-devel%{?_isa}
-BuildRequires: globus-gssapi-gsi-devel%{?_isa} >= 4
-BuildRequires: globus-xio-doc
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-gssapi-error%{?_isa} >= 4
+Requires: globus-gss-assist%{?_isa} >= 8
+Requires: globus-xio%{?_isa} >= 3
+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-gss-assist-devel%{?_isa} >= 8
+BuildRequires: globus-xio-devel%{?_isa} >= 3
+BuildRequires: globus-gssapi-gsi-devel%{?_isa} >= 9
+BuildRequires: globus-xio-doc >= 3
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -66,11 +51,11 @@ BuildRequires: tetex-latex
Summary: Globus Toolkit - Globus XIO GSI Driver Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa}
-Requires: globus-gssapi-error-devel%{?_isa} >= 2
-Requires: globus-gss-assist-devel%{?_isa} >= 3
-Requires: globus-xio-devel%{?_isa}
-Requires: globus-gssapi-gsi-devel%{?_isa} >= 4
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-gssapi-error-devel%{?_isa} >= 4
+Requires: globus-gss-assist-devel%{?_isa} >= 8
+Requires: globus-xio-devel%{?_isa} >= 3
+Requires: globus-gssapi-gsi-devel%{?_isa} >= 9
%package doc
Summary: Globus Toolkit - Globus XIO GSI Driver Documentation Files
@@ -110,13 +95,6 @@ Globus XIO GSI Driver Documentation Files
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-# Fix changed dependency namespace
-sed -e 's/"gssapi_error"/"globus_gssapi_error"/' -i pkgdata/pkg_data_src.gpt.in
%if "%{rhel}" == "5"
mkdir bin
@@ -135,18 +113,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}
@@ -162,35 +137,25 @@ 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
+grep 'lib.*\.la$' $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
+ >> $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
@@ -214,18 +179,23 @@ 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> - 2.1-1
+- Update to Globus Toolkit 5.2.0
+- Drop patches globus-xio-gsi-driver-deps.patch,
+ globus-xio-gsi-driver-funcgrp.patch,
+ globus-xio-gsi-driver-type-punned-pointer.patch and
+ globus-xio-gsi-driver-wrong-dep.patch (fixed upstream)
+
* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-7
- Add README file
- Add missing dependencies
diff --git a/sources b/sources
index 646907a..e62f1e4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-bef36b8184b58d38a7852abd7304d3aa globus_xio_gsi_driver-0.6.tar.gz
+414d430dffb8058a9a2238c3bac649ad globus_xio_gsi_driver-2.1.tar.gz
More information about the scm-commits
mailing list