From b44acac2136823a1f41a68e07141c31c66db45d8 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <ellert@fedoraproject.org>
Date: Feb 09 2010 08:21:01 +0000
Subject: - Update to Globus Toolkit 5.0.0


---

diff --git a/globus-xio-gsi-driver-wrong-version.patch b/globus-xio-gsi-driver-wrong-version.patch
new file mode 100644
index 0000000..8e7ab86
--- /dev/null
+++ b/globus-xio-gsi-driver-wrong-version.patch
@@ -0,0 +1,18 @@
+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-09 18:46:24.000000000 +0200
++++ globus_xio_gsi_driver-0.6/pkgdata/pkg_data_src.gpt.in	2010-01-23 06:48:27.567537310 +0100
+@@ -3,7 +3,7 @@
+ 
+ <gpt_package_metadata Name="globus_xio_gsi_driver" Format_Version="0.01">
+ 
+-    <Aging_Version Major="0" Minor="5" Age="0"/>
++    <Aging_Version Major="0" Minor="6" Age="0"/>
+     <Description> Globus XIO GSI Driver</Description>
+     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP@-@DIRT_BRANCH_ID@"/>
+ 
+@@ -63,5 +63,3 @@
+     </src_pkg>
+ 
+ </gpt_package_metadata>
+-~
+-~
diff --git a/globus-xio-gsi-driver.spec b/globus-xio-gsi-driver.spec
index 241cedb..ef44965 100644
--- a/globus-xio-gsi-driver.spec
+++ b/globus-xio-gsi-driver.spec
@@ -7,17 +7,17 @@
 Name:		globus-xio-gsi-driver
 %global _name %(tr - _ <<< %{name})
 Version:	0.6
-Release:	3%{?dist}
+Release:	4%{?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/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/xio/drivers/gsi globus_xio_gsi_driver-0.6
-#		cp -p gt4.2.1-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.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
 #		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,6 +32,9 @@ 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
@@ -102,6 +105,10 @@ Globus XIO GSI Driver Documentation Files
 %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
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -129,9 +136,6 @@ done
 sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
   -i pkgdata/pkg_data_src.gpt.in
 
-# Fix changed dependency namespace
-sed -e 's!gssapi_error!globus_&!' -i pkgdata/pkg_data_src.gpt.in
-
 %{_datadir}/globus/globus-bootstrap.sh
 
 %configure --with-flavor=%{flavor} --enable-doxygen
@@ -208,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Sat Jan 23 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 0.6-4
+- Update to Globus Toolkit 5.0.0
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 0.6-3
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch
diff --git a/import.log b/import.log
index b5fb483..93fa81f 100644
--- a/import.log
+++ b/import.log
@@ -1,2 +1,3 @@
 globus-xio-gsi-driver-0_6-1_fc9:HEAD:globus-xio-gsi-driver-0.6-1.fc9.src.rpm:1243391111
 globus-xio-gsi-driver-0_6-2_fc9:HEAD:globus-xio-gsi-driver-0.6-2.fc9.src.rpm:1245090454
+globus-xio-gsi-driver-0_6-4_fc12:F-12:globus-xio-gsi-driver-0.6-4.fc12.src.rpm:1265703645
diff --git a/sources b/sources
index dbfb741..c919d2a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-0e5c9558c7b7cc47f7aad1cfb0225c09  globus_xio_gsi_driver-0.6.tar.gz
+496418f9f32d2eb0dea98856120e0219  globus_xio_gsi_driver-0.6.tar.gz