[globus-proxy-utils/el4] Update to Globus Toolkit 5.2.0 Drop patch globus-proxy-utils-mingw.patch (fixed upstream)

Mattias Ellert ellert at fedoraproject.org
Sun Jan 8 01:19:40 UTC 2012 

commit 56844c9193692b36708c67738f91d5e8fb3649bd
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Jan 7 15:51:39 2012 +0100

    Update to Globus Toolkit 5.2.0
    Drop patch globus-proxy-utils-mingw.patch (fixed upstream)

 .gitignore                     |    2 +-
 GLOBUS-GSIC                    |    6 +++
 globus-proxy-utils-mingw.patch |   49 -------------------------
 globus-proxy-utils.spec        |   76 ++++++++++++++++++++-------------------
 sources                        |    2 +-
 5 files changed, 47 insertions(+), 88 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 85d3e4b..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/globus_proxy_utils-3.10.tar.gz
+/*.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-proxy-utils.spec b/globus-proxy-utils.spec
index 8e36809..e1c3ba6 100644
--- a/globus-proxy-utils.spec
+++ b/globus-proxy-utils.spec
@@ -1,47 +1,44 @@
 %ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
 %else
-%global flavor gcc32pthr
+%global flavor gcc32
 %endif
 
 Name:		globus-proxy-utils
 %global _name %(tr - _ <<< %{name})
-Version:	3.10
+Version:	5.0
 Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy Utility Programs
 
 Group:		Applications/Internet
 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.4/installers/src/gt5.0.4-all-source-installer.tar.bz2
-#		tar -jxf gt5.0.4-all-source-installer.tar.bz2
-#		mv gt5.0.4-all-source-installer/source-trees/gsi/proxy/proxy_utils/source globus_proxy_utils-3.10
-#		cp -p gt5.0.4-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_proxy_utils-3.10
-#		tar -zcf globus_proxy_utils-3.10.tar.gz globus_proxy_utils-3.10
-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
-#		Fixes for mingw compilation:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
-Patch0:		%{name}-mingw.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	globus-openssl%{?_isa} >= 1
-Requires:	globus-gsi-credential%{?_isa} >= 3
-BuildRequires:	grid-packaging-tools
-BuildRequires:	globus-gsi-proxy-ssl-devel%{?_isa} >= 1
-BuildRequires:	globus-gsi-credential-devel%{?_isa} >= 3
-BuildRequires:	globus-gsi-callback-devel%{?_isa}
-BuildRequires:	globus-openssl-module-devel%{?_isa}
-BuildRequires:	globus-gss-assist-devel%{?_isa} >= 3
-BuildRequires:	globus-gsi-openssl-error-devel%{?_isa}
-BuildRequires:	globus-openssl-devel%{?_isa} >= 1
-BuildRequires:	globus-gsi-proxy-core-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-credential%{?_isa} >= 5
+Requires:	globus-gsi-callback%{?_isa} >= 4
+Requires:	globus-openssl-module%{?_isa} >= 3
+Requires:	globus-gss-assist%{?_isa} >= 8
+Requires:	globus-gsi-openssl-error%{?_isa} >= 2
+Requires:	globus-gsi-proxy-core%{?_isa} >= 6
+Requires:	globus-common%{?_isa} >= 14
+Requires:	globus-gsi-sysconfig%{?_isa} >= 5
+BuildRequires:	grid-packaging-tools >= 3.4
+BuildRequires:	globus-core%{?_isa} >= 8
+BuildRequires:	globus-gsi-proxy-ssl-devel%{?_isa} >= 4
+BuildRequires:	globus-gsi-credential-devel%{?_isa} >= 5
+BuildRequires:	globus-gsi-callback-devel%{?_isa} >= 4
+BuildRequires:	globus-openssl-module-devel%{?_isa} >= 3
+BuildRequires:	globus-gss-assist-devel%{?_isa} >= 8
+BuildRequires:	globus-gsi-openssl-error-devel%{?_isa} >= 2
+BuildRequires:	globus-gsi-proxy-core-devel%{?_isa} >= 6
+BuildRequires:	globus-gsi-cert-utils-devel%{?_isa} >= 8
+BuildRequires:	globus-common-devel%{?_isa} >= 14
+BuildRequires:	globus-gsi-sysconfig-devel%{?_isa} >= 5
+BuildRequires:	openssl-devel%{?_isa}
 
 %description
 The Globus Toolkit is an open source software toolkit used for building Grid
@@ -54,7 +51,6 @@ Globus GSI Proxy Utility Programs
 
 %prep
 %setup -q -n %{_name}-%{version}
-%patch0 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -64,9 +60,15 @@ rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
+unset GLOBUS_LOCATION
+unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
-%configure --with-flavor=%{flavor}
+%configure --disable-static --with-flavor=%{flavor} \
+	   --with-docdir=%{_docdir}/%{name}-%{version}
+
+# Reduce overlinking
+sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
 
 make %{?_smp_mflags}
 
@@ -76,18 +78,15 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
 
-# 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
 
 # Generate package filelists
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
-    $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
-  | sed -e s!^!%{_prefix}! -e 's!.*/man/.*!%doc &*!' > package.filelist
+  | sed s!^!%{_prefix}! > package.filelist
+cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' >> package.filelist
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,10 +95,13 @@ 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
 
 %changelog
+* Wed Dec 14 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
+- Update to Globus Toolkit 5.2.0
+- Drop patch globus-proxy-utils-mingw.patch (fixed upstream)
+
 * Fri Jun 03 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.10-1
 - Update to Globus Toolkit 5.0.4
 
diff --git a/sources b/sources
index 1bd65b9..109c232 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b9b649d0432c9af51d5c19339f19fd5  globus_proxy_utils-3.10.tar.gz
+f36b76334c828dc1fa7a9fbea231f6a6  globus_proxy_utils-5.0.tar.gz

More information about the scm-commits mailing list