[globus-gsi-openssl-error/el4] Update to Globus Toolkit 5.2.0
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:18:25 UTC 2012
commit f27c190b5d4c172308c9281d917986079749b42c
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 07:25:32 2012 +0100
Update to Globus Toolkit 5.2.0
.gitignore | 4 +-
GLOBUS-GSIC | 6 +++
globus-gsi-openssl-error.spec | 78 +++++++++++++++--------------------------
sources | 2 +-
4 files changed, 37 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 64d801b..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-epstopdf-2.9.5gw
-globus_gsi_openssl_error-0.14.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-openssl-error.spec b/globus-gsi-openssl-error.spec
index 9e23820..361977c 100644
--- a/globus-gsi-openssl-error.spec
+++ b/globus-gsi-openssl-error.spec
@@ -1,25 +1,19 @@
%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-openssl-error
%global _name %(tr - _ <<< %{name})
-Version: 0.14
-Release: 8%{?dist}
+Version: 2.1
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus OpenSSL Error Handling
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/openssl_error/source globus_gsi_openssl_error-0.14
-# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_openssl_error-0.14
-# tar -zcf globus_gsi_openssl_error-0.14.tar.gz globus_gsi_openssl_error-0.14
-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
@@ -27,11 +21,11 @@ Source8: GLOBUS-GSIC
Source9: epstopdf-2.9.5gw
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-openssl%{?_isa} >= 1
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-common-devel%{?_isa} >= 3
-BuildRequires: globus-openssl-devel%{?_isa} >= 1
-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: openssl-devel%{?_isa}
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -48,9 +42,9 @@ BuildRequires: tetex-latex
Summary: Globus Toolkit - Globus OpenSSL Error Handling Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa} >= 3
-Requires: globus-openssl-devel%{?_isa} >= 1
-Requires: globus-core%{?_isa} >= 4
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-core%{?_isa} >= 8
+Requires: openssl-devel%{?_isa}
%package doc
Summary: Globus Toolkit - Globus OpenSSL Error Handling Documentation Files
@@ -107,18 +101,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}
@@ -134,32 +125,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
@@ -183,18 +160,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> - 2.1-1
+- Update to Globus Toolkit 5.2.0
+
* Sun Apr 24 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-8
- Add README file
diff --git a/sources b/sources
index 9d3b143..cda45b1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-f8c689c2c15573e4fec6ee5f6903f51b globus_gsi_openssl_error-0.14.tar.gz
+c25bfe178ae0c8fcbc1aa264b655df2e globus_gsi_openssl_error-2.1.tar.gz
More information about the scm-commits
mailing list