[globus-openssl-module/el4] Update to Globus Toolkit 5.2.0 Drop patch globus-openssl-module-mingw.patch (fixed upstream)
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:18:35 UTC 2012
commit b67c306fb4da236042e693ce2da8386d891835f9
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 12:16:21 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patch globus-openssl-module-mingw.patch (fixed upstream)
.gitignore | 4 +-
GLOBUS-GSIC | 6 ++
globus-openssl-module-mingw.patch | 15 -----
globus-openssl-module-sbin.patch | 12 ++++
globus-openssl-module.spec | 122 ++++++++++++++++++++-----------------
sources | 2 +-
6 files changed, 86 insertions(+), 75 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cb8bb7b..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-epstopdf-2.9.5gw
-globus_openssl_module-1.3.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-openssl-module-sbin.patch b/globus-openssl-module-sbin.patch
new file mode 100644
index 0000000..e3b18cd
--- /dev/null
+++ b/globus-openssl-module-sbin.patch
@@ -0,0 +1,12 @@
+diff -ur globus_openssl_module-2.0.orig/Makefile.am globus_openssl_module-2.0/Makefile.am
+--- globus_openssl_module-2.0.orig/Makefile.am 2010-12-08 18:29:44.000000000 +0100
++++ globus_openssl_module-2.0/Makefile.am 2011-02-18 06:22:11.801647372 +0100
+@@ -12,7 +12,7 @@
+
+ doc_DATA = GLOBUS_LICENSE
+
+-bin_SCRIPTS = globus-update-certificate-dir
++sbin_SCRIPTS = globus-update-certificate-dir
+
+ MANUAL_SOURCE = globus-update-certificate-dir-manual.xml \
+ manual.xml
diff --git a/globus-openssl-module.spec b/globus-openssl-module.spec
index 8553264..215790d 100644
--- a/globus-openssl-module.spec
+++ b/globus-openssl-module.spec
@@ -1,42 +1,36 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
Name: globus-openssl-module
%global _name %(tr - _ <<< %{name})
-Version: 1.3
-Release: 3%{?dist}
+Version: 3.1
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus OpenSSL Module Wrapper
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/openssl_module/source globus_openssl_module-1.3
-# cp -p gt5.0.2-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_openssl_module-1.3
-# tar -zcf globus_openssl_module-1.3.tar.gz globus_openssl_module-1.3
-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
-# Fixes for mingw compilation:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
-Patch0: %{name}-mingw.patch
+Patch0: %{name}-sbin.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-openssl%{?_isa} >= 1
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-gsi-proxy-ssl-devel%{?_isa} >= 1
-BuildRequires: globus-common-devel%{?_isa} >= 3
-BuildRequires: globus-gsi-openssl-error-devel%{?_isa}
-BuildRequires: globus-openssl-devel%{?_isa} >= 1
-BuildRequires: globus-core%{?_isa} >= 4
+Requires: globus-gsi-proxy-ssl%{?_isa} >= 4
+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-proxy-ssl-devel%{?_isa} >= 4
+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"
@@ -49,15 +43,21 @@ BuildRequires: tex(latex)
BuildRequires: tetex-latex
%endif
+%package progs
+Summary: Globus Toolkit - Globus OpenSSL Module Wrapper Programs
+Group: Applications/Internet
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: openssl
+
%package devel
Summary: Globus Toolkit - Globus OpenSSL Module Wrapper Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-gsi-proxy-ssl-devel%{?_isa} >= 1
-Requires: globus-common-devel%{?_isa} >= 3
-Requires: globus-gsi-openssl-error-devel%{?_isa}
-Requires: globus-openssl-devel%{?_isa} >= 1
-Requires: globus-core%{?_isa} >= 4
+Requires: globus-gsi-proxy-ssl-devel%{?_isa} >= 4
+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 OpenSSL Module Wrapper Documentation Files
@@ -76,6 +76,15 @@ using the Globus Toolkit to unlock the potential of grids for their cause.
The %{name} package contains:
Globus OpenSSL Module Wrapper
+%description progs
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
+
+The %{name}-progs package contains:
+Globus OpenSSL Module Wrapper Programs
+
%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
@@ -115,18 +124,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}
@@ -140,34 +146,29 @@ make install DESTDIR=$RPM_BUILD_ROOT
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
+# Don't use /usr/bin/env
+sed 's!/usr/bin/env perl!/usr/bin/perl!' \
+ -i $RPM_BUILD_ROOT%{_sbindir}/globus-update-certificate-dir
-# 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
+# Move script man pages to progs package
+grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+ >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
+sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.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
+# Remove libtool archives (.la files)
+find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
-# 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
@@ -175,6 +176,8 @@ install -m 644 -p %{SOURCE8} \
# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
| sed s!^!%{_prefix}! > package.filelist
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
+ | sed -e s!^!%{_prefix}! -e 's!.*/man/.*!%doc &*!' > package-progs.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
| sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
@@ -191,18 +194,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-progs.filelist progs
+%defattr(-,root,root,-)
+
%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> - 3.1-1
+- Update to Globus Toolkit 5.2.0
+- Drop patch globus-openssl-module-mingw.patch (fixed upstream)
+
* Sun Apr 24 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3-3
- Add README file
diff --git a/sources b/sources
index a416aef..3b23b1a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-e041ab21b70c89ed5e19fbee6961c85e globus_openssl_module-1.3.tar.gz
+952ec92bc4e0dcc1aee90405eb2790ad globus_openssl_module-3.1.tar.gz
More information about the scm-commits
mailing list