[globus-gssapi-error/el4] Update to Globus Toolkit 5.2.0 Drop patch globus-gssapi-error-deps.patch (fixed upstream)
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:19:49 UTC 2012
commit 679f7e2c123580e2182003b3132002117af1f30c
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 16:04:36 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patch globus-gssapi-error-deps.patch (fixed upstream)
.gitignore | 4 +-
GLOBUS-GSIC | 6 +++
globus-gssapi-error-deps.patch | 27 ------------
globus-gssapi-error.spec | 92 ++++++++++++++-------------------------
sources | 2 +-
5 files changed, 42 insertions(+), 89 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8c294e..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-epstopdf-2.9.5gw
-globus_gssapi_error-2.5.tar.gz
+/epstopdf-2.9.5gw
+/*.tar.gz
diff --git a/GLOBUS-GSIC b/GLOBUS-GSIC
index 35fe6ee..b972218 100644
--- a/GLOBUS-GSIC
+++ b/GLOBUS-GSIC
@@ -6,6 +6,9 @@ http://www.globus.org/toolkit/docs/latest-stable/security/gsic/
Admin Guide:
http://www.globus.org/toolkit/docs/latest-stable/security/gsic/admin/
+User's Guide
+http://www.globus.org/toolkit/docs/latest-stable/security/gsic/user/
+
Developer's Guide:
http://www.globus.org/toolkit/docs/latest-stable/security/gsic/developer/
@@ -20,3 +23,6 @@ http://www.globus.org/toolkit/docs/latest-stable/security/gsic/qp/
Migrating Guide:
http://www.globus.org/toolkit/docs/latest-stable/security/gsic/mig/
+
+Globus RPM packaging is supported by the Initiative for Globus in Europe:
+http://www.ige-project.eu/
diff --git a/globus-gssapi-error.spec b/globus-gssapi-error.spec
index e23317b..3e2c078 100644
--- a/globus-gssapi-error.spec
+++ b/globus-gssapi-error.spec
@@ -1,41 +1,34 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
Name: globus-gssapi-error
%global _name %(tr - _ <<< %{name})
-Version: 2.5
-Release: 8%{?dist}
+Version: 4.1
+Release: 1%{?dist}
Summary: Globus Toolkit - GSSAPI Error 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.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/gsi/gssapi_error/source globus_gssapi_error-2.5
-# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gssapi_error-2.5
-# tar -zcf globus_gssapi_error-2.5.tar.gz globus_gssapi_error-2.5
-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-GSIC
# 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
-# Missing direct dependencies:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7165
-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-gssapi-gsi-devel%{?_isa}
-BuildRequires: globus-core%{?_isa} >= 4
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-gss-assist%{?_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-gss-assist-devel%{?_isa} >= 8
+BuildRequires: globus-gssapi-gsi-devel%{?_isa} >= 9
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -52,10 +45,10 @@ BuildRequires: tetex-latex
Summary: Globus Toolkit - GSSAPI Error 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-gssapi-gsi-devel%{?_isa}
-Requires: globus-core%{?_isa} >= 4
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-gss-assist-devel%{?_isa} >= 8
+Requires: globus-gssapi-gsi-devel%{?_isa} >= 9
+Requires: globus-core%{?_isa} >= 8
%package doc
Summary: Globus Toolkit - GSSAPI Error Library Documentation Files
@@ -94,10 +87,6 @@ GSSAPI Error Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
-%patch0 -p1
-
-# Fix package metadata
-sed 's/"gssapi_error"/"globus_gssapi_error"/' -i pkgdata/pkg_data_src.gpt.in
%if "%{rhel}" == "5"
mkdir bin
@@ -116,18 +105,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}
@@ -143,32 +129,18 @@ 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
# 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
@@ -192,18 +164,20 @@ 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.1-1
+- Update to Globus Toolkit 5.2.0
+- Drop patch globus-gssapi-error-deps.patch (fixed upstream)
+
* Tue Jun 07 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-8
- Fix dependency patch
diff --git a/sources b/sources
index da588dd..290dd1d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-fec09f17f0269480baade5d86b0ddf13 globus_gssapi_error-2.5.tar.gz
+cb1a0b23c6230845d9ae52cb3cd2b0d9 globus_gssapi_error-4.1.tar.gz
More information about the scm-commits
mailing list