[globus-gsi-credential/el4] Update to Globus Toolkit 5.2.0
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:18:58 UTC 2012
commit de22f7ce4469a4404ea05d4a9b80914d814c3de2
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 15:11:10 2012 +0100
Update to Globus Toolkit 5.2.0
.gitignore | 4 +-
GLOBUS-GSIC | 6 ++
globus-gsi-credential-deps.patch | 39 ++++++++++++++
globus-gsi-credential.spec | 105 ++++++++++++++++---------------------
sources | 2 +-
5 files changed, 93 insertions(+), 63 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c98e32f..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-epstopdf-2.9.5gw
-globus_gsi_credential-3.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-gsi-credential-deps.patch b/globus-gsi-credential-deps.patch
new file mode 100644
index 0000000..14d9194
--- /dev/null
+++ b/globus-gsi-credential-deps.patch
@@ -0,0 +1,39 @@
+diff -ur globus_gsi_credential-5.1.orig/configure.in globus_gsi_credential-5.1/configure.in
+--- globus_gsi_credential-5.1.orig/configure.in 2003-10-27 19:10:50.000000000 +0100
++++ globus_gsi_credential-5.1/configure.in 2011-12-27 12:49:31.346651061 +0100
+@@ -9,6 +9,8 @@
+ dnl Initialize the automake rules the last argument
+ AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
+
++GLOBUS_OPENSSL
++
+ LAC_DOXYGEN(["../library"])
+
+ GLOBUS_FINALIZE
+diff -ur globus_gsi_credential-5.1.orig/pkgdata/pkg_data_src.gpt.in globus_gsi_credential-5.1/pkgdata/pkg_data_src.gpt.in
+--- globus_gsi_credential-5.1.orig/pkgdata/pkg_data_src.gpt.in 2011-10-25 15:27:41.000000000 +0200
++++ globus_gsi_credential-5.1/pkgdata/pkg_data_src.gpt.in 2011-12-27 12:49:06.082648116 +0100
+@@ -17,9 +17,9 @@
+ <Simple_Version Major="14"/>
+ </Version>
+ </Dependency>
+- <Dependency Name="globus_openssl_module">
++ <Dependency Name="globus_gsi_proxy_ssl">
+ <Version>
+- <Simple_Version Major="3"/>
++ <Simple_Version Major="4"/>
+ </Version>
+ </Dependency>
+ <Dependency Name="globus_gsi_openssl_error">
+@@ -49,9 +49,9 @@
+ <Simple_Version Major="14"/>
+ </Version>
+ </Dependency>
+- <Dependency Name="globus_openssl_module">
++ <Dependency Name="globus_gsi_proxy_ssl">
+ <Version>
+- <Simple_Version Major="3"/>
++ <Simple_Version Major="4"/>
+ </Version>
+ </Dependency>
+ <Dependency Name="globus_gsi_openssl_error">
diff --git a/globus-gsi-credential.spec b/globus-gsi-credential.spec
index 7316398..468e913 100644
--- a/globus-gsi-credential.spec
+++ b/globus-gsi-credential.spec
@@ -1,42 +1,42 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
Name: globus-gsi-credential
%global _name %(tr - _ <<< %{name})
-Version: 3.5
-Release: 3%{?dist}
+Version: 5.1
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus GSI Credential 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.2/installers/src/gt5.0.2-all-source-installer.tar.bz2
-# tar -jxf gt5.0.2-all-source-installer.tar.bz2
-# mv gt5.0.2-all-source-installer/source-trees/gsi/credential/source globus_gsi_credential-3.5
-# cp -p gt5.0.2-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_credential-3.5
-# tar -zcf globus_gsi_credential-3.5.tar.gz globus_gsi_credential-3.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
+Patch0: %{name}-deps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-openssl%{?_isa} >= 1
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-gsi-callback-devel%{?_isa}
-BuildRequires: globus-openssl-module-devel%{?_isa}
-BuildRequires: globus-gsi-openssl-error-devel%{?_isa}
-BuildRequires: globus-openssl-devel%{?_isa} >= 1
-BuildRequires: globus-core%{?_isa} >= 4
-BuildRequires: globus-gsi-cert-utils-devel%{?_isa} >= 1
-BuildRequires: globus-common-devel%{?_isa} >= 3
-BuildRequires: globus-gsi-sysconfig-devel%{?_isa} >= 1
+Requires: globus-gsi-cert-utils%{?_isa} >= 8
+Requires: globus-gsi-proxy-ssl%{?_isa} >= 4
+Requires: globus-gsi-callback%{?_isa} >= 4
+Requires: globus-gsi-sysconfig%{?_isa} >= 5
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-gsi-openssl-error%{?_isa} >= 2
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-gsi-cert-utils-devel%{?_isa} >= 8
+BuildRequires: globus-gsi-proxy-ssl-devel%{?_isa} >= 4
+BuildRequires: globus-gsi-callback-devel%{?_isa} >= 4
+BuildRequires: globus-gsi-sysconfig-devel%{?_isa} >= 5
+BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: globus-gsi-openssl-error-devel%{?_isa} >= 2
+BuildRequires: openssl-devel%{?_isa}
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -53,14 +53,14 @@ BuildRequires: tetex-latex
Summary: Globus Toolkit - Globus GSI Credential Library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-gsi-callback-devel%{?_isa}
-Requires: globus-openssl-module-devel%{?_isa}
-Requires: globus-gsi-openssl-error-devel%{?_isa}
-Requires: globus-openssl-devel%{?_isa} >= 1
-Requires: globus-core%{?_isa} >= 4
-Requires: globus-gsi-cert-utils-devel%{?_isa} >= 1
-Requires: globus-common-devel%{?_isa} >= 3
-Requires: globus-gsi-sysconfig-devel%{?_isa} >= 1
+Requires: globus-gsi-cert-utils-devel%{?_isa} >= 8
+Requires: globus-gsi-proxy-ssl-devel%{?_isa} >= 4
+Requires: globus-gsi-callback-devel%{?_isa} >= 4
+Requires: globus-gsi-sysconfig-devel%{?_isa} >= 5
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-gsi-openssl-error-devel%{?_isa} >= 2
+Requires: globus-core%{?_isa} >= 8
+Requires: openssl-devel%{?_isa}
%package doc
Summary: Globus Toolkit - Globus GSI Credential Library Documentation Files
@@ -99,6 +99,7 @@ Globus GSI Credential Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -117,18 +118,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}
@@ -144,32 +142,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
+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
@@ -193,18 +177,19 @@ 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
+* Tue Dec 13 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.1-1
+- Update to Globus Toolkit 5.2.0
+
* Sun Apr 24 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.5-3
- Add README file
diff --git a/sources b/sources
index d8f6fd8..8225ad2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-cfb0f543f1b6917a7ea9f6bf0f681791 globus_gsi_credential-3.5.tar.gz
+79cfedcc265d19a7ef83a83d55cbc47d globus_gsi_credential-5.1.tar.gz
More information about the scm-commits
mailing list