rpms/globus-xio-gsi-driver/EL-5 globus-xio-gsi-driver-wrong-dep.patch, 1.1, 1.2 globus-xio-gsi-driver.spec, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.3, 1.4 globus-xio-gsi-driver-wrong-version.patch, 1.1, NONE

Mattias Ellert ellert at fedoraproject.org
Fri Apr 16 15:22:21 UTC 2010


Author: ellert

Update of /cvs/pkgs/rpms/globus-xio-gsi-driver/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1504/EL-5

Modified Files:
	globus-xio-gsi-driver-wrong-dep.patch 
	globus-xio-gsi-driver.spec import.log sources 
Removed Files:
	globus-xio-gsi-driver-wrong-version.patch 
Log Message:
* Wed Apr 14 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-5
- Update to Globus Toolkit 5.0.1


globus-xio-gsi-driver-wrong-dep.patch:
 pkg_data_src.gpt.in |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Index: globus-xio-gsi-driver-wrong-dep.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-gsi-driver/EL-5/globus-xio-gsi-driver-wrong-dep.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-xio-gsi-driver-wrong-dep.patch	27 May 2009 02:36:28 -0000	1.1
+++ globus-xio-gsi-driver-wrong-dep.patch	16 Apr 2010 15:22:21 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur globus_xio_gsi_driver-0.6.orig/pkgdata/pkg_data_src.gpt.in globus_xio_gsi_driver-0.6/pkgdata/pkg_data_src.gpt.in
---- globus_xio_gsi_driver-0.6.orig/pkgdata/pkg_data_src.gpt.in	2008-09-18 22:29:09.000000000 +0200
-+++ globus_xio_gsi_driver-0.6/pkgdata/pkg_data_src.gpt.in	2008-10-20 12:28:23.000000000 +0200
+--- globus_xio_gsi_driver-0.6.orig/pkgdata/pkg_data_src.gpt.in	2010-03-18 10:35:33.000000000 +0100
++++ globus_xio_gsi_driver-0.6/pkgdata/pkg_data_src.gpt.in	2010-04-14 09:32:49.768553050 +0200
 @@ -26,7 +26,7 @@
              </Dependency>
          </Source_Dependencies>
@@ -10,3 +10,9 @@ diff -ur globus_xio_gsi_driver-0.6.orig/
              <Dependency Name="globus_xio">
                  <Version>
                      <Simple_Version Major="0"/>
+@@ -63,5 +63,3 @@
+     </src_pkg>
+ 
+ </gpt_package_metadata>
+-~
+-~


Index: globus-xio-gsi-driver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-gsi-driver/EL-5/globus-xio-gsi-driver.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-xio-gsi-driver.spec	9 Feb 2010 08:22:23 -0000	1.4
+++ globus-xio-gsi-driver.spec	16 Apr 2010 15:22:21 -0000	1.5
@@ -7,17 +7,17 @@
 Name:		globus-xio-gsi-driver
 %global _name %(tr - _ <<< %{name})
 Version:	0.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - Globus XIO GSI Driver
 
 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/xio/drivers/gsi globus_xio_gsi_driver-0.6
-#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_gsi_driver-0.6
+#		wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.1/installers/src/gt5.0.1-all-source-installer.tar.bz2
+#		tar -jxf gt5.0.1-all-source-installer.tar.bz2
+#		mv gt5.0.1-all-source-installer/source-trees/xio/drivers/gsi globus_xio_gsi_driver-0.6
+#		cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_gsi_driver-0.6
 #		tar -zcf globus_xio_gsi_driver-0.6.tar.gz globus_xio_gsi_driver-0.6
 Source:		%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
@@ -32,9 +32,6 @@ Patch1:		%{name}-doxygen.patch
 #		Dereferencing of type-punned pointers:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6606
 Patch2:		%{name}-type-punned-pointer.patch
-#		Fix old version number:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6924
-Patch3:		%{name}-wrong-version.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-common
@@ -105,7 +102,6 @@ Globus XIO GSI Driver Documentation File
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # Fix changed dependency namespace
 sed -e 's/"gssapi_error"/"globus_gssapi_error"/' -i pkgdata/pkg_data_src.gpt.in
@@ -212,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Apr 14 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-5
+- Update to Globus Toolkit 5.0.1
+
 * Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-4
 - Update to Globus Toolkit 5.0.0
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-gsi-driver/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Feb 2010 08:22:23 -0000	1.3
+++ import.log	16 Apr 2010 15:22:21 -0000	1.4
@@ -1,3 +1,4 @@
 globus-xio-gsi-driver-0_6-1_fc9:EL-5:globus-xio-gsi-driver-0.6-1.fc9.src.rpm:1243391760
 globus-xio-gsi-driver-0_6-2_fc9:EL-5:globus-xio-gsi-driver-0.6-2.fc9.src.rpm:1245090780
 globus-xio-gsi-driver-0_6-4_fc12:EL-5:globus-xio-gsi-driver-0.6-4.fc12.src.rpm:1265703728
+globus-xio-gsi-driver-0_6-5_fc12:EL-5:globus-xio-gsi-driver-0.6-5.fc12.src.rpm:1271431325


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-gsi-driver/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Feb 2010 08:22:23 -0000	1.3
+++ sources	16 Apr 2010 15:22:21 -0000	1.4
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-496418f9f32d2eb0dea98856120e0219  globus_xio_gsi_driver-0.6.tar.gz
+bef36b8184b58d38a7852abd7304d3aa  globus_xio_gsi_driver-0.6.tar.gz


--- globus-xio-gsi-driver-wrong-version.patch DELETED ---



More information about the scm-commits mailing list