rpms/globus-proxy-utils/F-12 globus-proxy-utils-deps.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 globus-proxy-utils-ldflag-overwrt.patch, 1.1, 1.2 globus-proxy-utils.spec, 1.4, 1.5 import.log, 1.2, 1.3 sources, 1.2, 1.3

Mattias Ellert ellert at fedoraproject.org
Tue Feb 9 08:10:59 UTC 2010 

Author: ellert

Update of /cvs/pkgs/rpms/globus-proxy-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12469/F-12

Modified Files:
	.cvsignore globus-proxy-utils-ldflag-overwrt.patch 
	globus-proxy-utils.spec import.log sources 
Added Files:
	globus-proxy-utils-deps.patch 
Log Message:
* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.5-1
- Update to Globus Toolkit 5.0.0


globus-proxy-utils-deps.patch:
 pkg_data_src.gpt.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-proxy-utils-deps.patch ---
diff -ur globus_proxy_utils-3.5.orig/pkgdata/pkg_data_src.gpt.in globus_proxy_utils-3.5/pkgdata/pkg_data_src.gpt.in
--- globus_proxy_utils-3.5.orig/pkgdata/pkg_data_src.gpt.in	2008-11-17 23:27:38.000000000 +0100
+++ globus_proxy_utils-3.5/pkgdata/pkg_data_src.gpt.in	2010-01-22 22:11:50.876281589 +0100
@@ -53,7 +53,7 @@
             </Dependency>
             <Dependency Name="globus_gsi_credential">
                 <Version>
-                    <Simple_Version Major="1"/>
+                    <Simple_Version Major="3"/>
                 </Version>
             </Dependency>
             <Dependency Name="globus_gsi_callback">
@@ -112,7 +112,7 @@
             </Dependency>
             <Dependency Name="globus_gsi_credential">
                 <Version>
-                    <Simple_Version Major="1"/>
+                    <Simple_Version Major="3"/>
                 </Version>
             </Dependency>
             <Dependency Name="globus_gsi_callback">


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 May 2009 09:00:09 -0000	1.2
+++ .cvsignore	9 Feb 2010 08:10:58 -0000	1.3
@@ -1 +1 @@
-globus_proxy_utils-2.5.tar.gz
+globus_proxy_utils-3.5.tar.gz

globus-proxy-utils-ldflag-overwrt.patch:
 Makefile.am |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Index: globus-proxy-utils-ldflag-overwrt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/F-12/globus-proxy-utils-ldflag-overwrt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-proxy-utils-ldflag-overwrt.patch	23 May 2009 09:00:09 -0000	1.1
+++ globus-proxy-utils-ldflag-overwrt.patch	9 Feb 2010 08:10:59 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur globus_proxy_utils-2.5.orig/programs/Makefile.am globus_proxy_utils-2.5/programs/Makefile.am
---- globus_proxy_utils-2.5.orig/programs/Makefile.am	2008-04-28 20:23:25.000000000 +0200
-+++ globus_proxy_utils-2.5/programs/Makefile.am	2009-05-10 18:21:15.000000000 +0200
+diff -ur globus_proxy_utils-3.5.orig/programs/Makefile.am globus_proxy_utils-3.5/programs/Makefile.am
+--- globus_proxy_utils-3.5.orig/programs/Makefile.am	2008-10-20 18:31:34.000000000 +0200
++++ globus_proxy_utils-3.5/programs/Makefile.am	2010-01-22 21:52:49.454530514 +0100
 @@ -6,11 +6,14 @@
  INCLUDES =  -I$(top_srcdir) $(GPT_INCLUDES) 
  
@@ -14,6 +14,6 @@ diff -ur globus_proxy_utils-2.5.orig/pro
 +grid_proxy_info_LDFLAGS = $(GPT_LDFLAGS)
  
  LDADD = $(GPT_PGM_LINKS)
--LDFLAGS = $(GPT_LDFLAGS)
+-LDFLAGS += $(GPT_LDFLAGS)
  
  include $(top_srcdir)/globus_automake_post


Index: globus-proxy-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/F-12/globus-proxy-utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-proxy-utils.spec	21 Aug 2009 13:38:49 -0000	1.4
+++ globus-proxy-utils.spec	9 Feb 2010 08:10:59 -0000	1.5
@@ -6,19 +6,19 @@
 
 Name:		globus-proxy-utils
 %global _name %(tr - _ <<< %{name})
-Version:	2.5
-Release:	4%{?dist}
+Version:	3.5
+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/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
-#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
-#		mv gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_utils/source globus_proxy_utils-2.5
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_proxy_utils-2.5
-#		tar -zcf globus_proxy_utils-2.5.tar.gz globus_proxy_utils-2.5
+#		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/proxy/proxy_utils/source globus_proxy_utils-3.5
+#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_proxy_utils-3.5
+#		tar -zcf globus_proxy_utils-3.5.tar.gz globus_proxy_utils-3.5
 Source:		%{_name}-%{version}.tar.gz
 #		Do not overwrite LDFLAGS:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6738
@@ -26,12 +26,16 @@ Patch0:		%{name}-ldflag-overwrt.patch
 #		Fixes for mingw compilation:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
 Patch1:		%{name}-mingw.patch
+#		Fix insufficient dependencies:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6923
+Patch2:		%{name}-deps.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} >= 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
@@ -56,6 +60,7 @@ Globus GSI Proxy Utility Programs
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -95,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.5-1
+- Update to Globus Toolkit 5.0.0
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.5-4
 - rebuilt with new openssl
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jun 2009 17:44:42 -0000	1.2
+++ import.log	9 Feb 2010 08:10:59 -0000	1.3
@@ -1,2 +1,3 @@
 globus-proxy-utils-2_5-1_fc9:HEAD:globus-proxy-utils-2.5-1.fc9.src.rpm:1243069171
 globus-proxy-utils-2_5-2_fc9:HEAD:globus-proxy-utils-2.5-2.fc9.src.rpm:1245087859
+globus-proxy-utils-3_5-1_fc12:F-12:globus-proxy-utils-3.5-1.fc12.src.rpm:1265703044


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 May 2009 09:00:09 -0000	1.2
+++ sources	9 Feb 2010 08:10:59 -0000	1.3
@@ -1 +1 @@
-af9fc9245b6e850d0043a988eeef789f  globus_proxy_utils-2.5.tar.gz
+fefb94ba14136d0b05edbfc8960fccdf  globus_proxy_utils-3.5.tar.gz

More information about the scm-commits mailing list