From f27c8e6190b82664e8d81f5f6bb7133c283739ec Mon Sep 17 00:00:00 2001
From: Mattias Ellert <ellert@fedoraproject.org>
Date: Jul 17 2010 16:00:41 +0000
Subject: - Update to Globus Toolkit 5.0.2


---

diff --git a/.cvsignore b/.cvsignore
index f39a1d2..30f18e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
 epstopdf-2.9.5gw
-globus_common-11.4.tar.gz
+globus_common-11.5.tar.gz
 globus_common_setup-2.6.tar.gz
diff --git a/globus-common.spec b/globus-common.spec
index abac8db..c3677db 100644
--- a/globus-common.spec
+++ b/globus-common.spec
@@ -4,11 +4,11 @@
 %global flavor gcc32pthr
 %endif
 
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:		globus-common
 %global _name %(tr - _ <<< %{name})
-Version:	11.4
+Version:	11.5
 %global setupversion 2.6
 Release:	1%{?dist}
 Summary:	Globus Toolkit - Common Library
@@ -17,17 +17,17 @@ 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.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/common/source globus_common-11.4
-#		cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common-11.4
-#		tar -zcf globus_common-11.4.tar.gz globus_common-11.4
+#		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/common/source globus_common-11.5
+#		cp -p gt5.0.2-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common-11.5
+#		tar -zcf globus_common-11.5.tar.gz globus_common-11.5
 Source:		%{_name}-%{version}.tar.gz
 #		Source1 is extracted from the globus toolkit installer:
-#		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/common/setup globus_common_setup-2.6
-#		cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common_setup-2.6
+#		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/common/setup globus_common_setup-2.6
+#		cp -p gt5.0.2-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
@@ -107,11 +107,7 @@ Group:		Applications/Internet
 Provides:	%{name}-setup = %{setupversion}
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	globus-libtool%{?_isa} >= 1
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 4
-Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-%else
-Requires:	perl
-%endif
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %package devel
 Summary:	Globus Toolkit - Common Library Development Files
@@ -230,7 +226,7 @@ sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
 
 %{_datadir}/globus/globus-bootstrap.sh
 
-export GLOBUS_VERSION=5.0.1
+export GLOBUS_VERSION=5.0.2
 %configure --with-flavor=%{flavor} --enable-doxygen
 
 make %{?_smp_mflags}
@@ -358,15 +354,16 @@ rm -f config.log config.status
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/packages
+%dir %{_datadir}/globus/packages/setup
 %dir %{_datadir}/globus/packages/%{_name}
+%dir %{_datadir}/globus/setup
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-progs.filelist progs
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}_setup
-%{_datadir}/globus/packages/setup
-%dir %{_datadir}/globus/setup
+%{_datadir}/globus/packages/setup/%{_name}_setup
 %dir %{perl_vendorlib}/Globus
 %dir %{perl_vendorlib}/Globus/Core
 %ghost %{_datadir}/globus/setup/globus-sh-tools-vars.sh
@@ -382,6 +379,12 @@ rm -f config.log config.status
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Sat Jul 17 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 11.5-1
+- Update to Globus Toolkit 5.0.2
+
+* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 11.4-2
+- Mass rebuild with perl-5.12.0
+
 * Tue Apr 13 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 11.4-1
 - Update to Globus Toolkit 5.0.1
 
diff --git a/import.log b/import.log
index 701baa0..5e6e4e0 100644
--- a/import.log
+++ b/import.log
@@ -8,3 +8,4 @@ globus-common-10_2-8_fc11:EL-4:globus-common-10.2-8.fc11.src.rpm:1257706633
 globus-common-11_2-1_fc12:EL-4:globus-common-11.2-1.fc12.src.rpm:1265700577
 globus-common-11_2-2_fc12:EL-4:globus-common-11.2-2.fc12.src.rpm:1267093122
 globus-common-11_4-1_fc12:EL-4:globus-common-11.4-1.fc12.src.rpm:1271428534
+globus-common-11_5-1_fc12:EL-4:globus-common-11.5-1.fc12.src.rpm:1279382424
diff --git a/sources b/sources
index 3669dfa..11110f8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-6b29844884c08330fb6b51465a0dbe51  globus_common-11.4.tar.gz
-61567df0e5e65ee8e20d498323d8dde2  globus_common_setup-2.6.tar.gz
+ea66ae383ee7d2c4b928b234ce1daa4b  globus_common-11.5.tar.gz
+036fe1d952bd4b2cce3e2ae377e8eea6  globus_common_setup-2.6.tar.gz