rpms/globus-core/EL-4 .cvsignore, 1.3, 1.4 globus-core.spec, 1.8, 1.9 globus-spec-creator, 1.5, 1.6 import.log, 1.7, 1.8 sources, 1.4, 1.5

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/EL-4
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32087/EL-4

Modified Files:
	.cvsignore globus-core.spec globus-spec-creator import.log 
	sources 
Log Message:
* Sat Jul 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.17-1
- Update to Globus Toolkit 5.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Apr 2010 14:28:24 -0000	1.3
+++ .cvsignore	17 Jul 2010 15:44:11 -0000	1.4
@@ -1 +1 @@
-globus_core-5.16.tar.gz
+globus_core-5.17.tar.gz


Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-4/globus-core.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- globus-core.spec	16 Apr 2010 14:28:24 -0000	1.8
+++ globus-core.spec	17 Jul 2010 15:44:11 -0000	1.9
@@ -8,11 +8,11 @@
 
 %global debug_package %{nil}
 
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
-Version:	5.16
+Version:	5.17
 Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
@@ -20,10 +20,10 @@ Group:		Development/Tools
 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/core/cource globus_core-5.16
-#		tar -zcf globus_core-5.16.tar.gz globus_core-5.16
+#		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/core/cource globus_core-5.17
+#		tar -zcf globus_core-5.17.tar.gz globus_core-5.17
 Source:		%{_name}-%{version}.tar.gz
 #		GPT metadata to pkg-config file converter
 Source1:	globus-gpt2pkg-config
@@ -208,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Sat Jul 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.17-1
+- Update to Globus Toolkit 5.0.2
+
 * Mon Apr 12 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.16-1
 - Update to Globus Toolkit 5.0.1
 


Index: globus-spec-creator
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-4/globus-spec-creator,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- globus-spec-creator	16 Apr 2010 14:28:24 -0000	1.5
+++ globus-spec-creator	17 Jul 2010 15:44:11 -0000	1.6
@@ -12,7 +12,7 @@ my $setupfile;
 my $release = "1";
 my $directory;
 my $setupdirectory;
-my $toolkitversion = "5.0.1";
+my $toolkitversion = "5.0.2";
 my $email;
 my $nodoc;
 my $help;
@@ -254,9 +254,12 @@ print "BuildRoot:\t%{_tmppath}/%{name}-%
 print "\n";
 
 if (!$libs) {
-    print "Provides:\t%{name}-setup = %{setupversion}\n"
-	if defined $setupfile;
     my $hasrequires = 0;
+    if (defined $setupfile) {
+	print "Provides:\t%{name}-setup = %{setupversion}\n";
+	print "Requires:\tglobus-common >= 11.5\n";
+	$hasrequires = 1;
+    }
     while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
 	# Explicit Requires for libraries should not be used according to the
 	# packaging guidelines. The autogenerated Requires on sonames make them
@@ -348,6 +351,7 @@ else {
 	print "Provides:\t%{name}-setup = %{setupversion}\n"
 	    if defined $setupfile;
 	print "Requires:\t%{name}%{?_isa} = %{version}-%{release}\n";
+	print "Requires:\tglobus-common >= 11.5\n" if defined $setupfile;
 	while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
 	    # Explicit Requires for libraries should not be used according
 	    # to the packaging guidelines. The autogenerated Requires on
@@ -673,8 +677,7 @@ print "
 " if ($progspkg);
 
 print "%dir %{_datadir}/globus/packages/%{_name}_setup
-%{_datadir}/globus/packages/setup
-%dir %{_datadir}/globus/setup
+%{_datadir}/globus/packages/setup/%{_name}_setup
 " if defined $setupfile;
 
 print "
@@ -729,7 +732,7 @@ The package's source directory in the to
 
 =item B<-toolkitversion> versionnumber
 
-Globus toolkit version (default: 5.0.1)
+Globus toolkit version (default: 5.0.2)
 
 =item B<-email> emailaddress
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-4/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	16 Apr 2010 14:28:24 -0000	1.7
+++ import.log	17 Jul 2010 15:44:11 -0000	1.8
@@ -5,3 +5,4 @@ globus-core-5_15-4_fc9:EL-4:globus-core-
 globus-core-5_15-5_fc9:EL-4:globus-core-5.15-5.fc9.src.rpm:1245078669
 globus-core-5_15-8_fc12:EL-4:globus-core-5.15-8.fc12.src.rpm:1265700194
 globus-core-5_16-1_fc12:EL-4:globus-core-5.16-1.fc12.src.rpm:1271428086
+globus-core-5_17-1_fc12:EL-4:globus-core-5.17-1.fc12.src.rpm:1279381434


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Apr 2010 14:28:24 -0000	1.4
+++ sources	17 Jul 2010 15:44:11 -0000	1.5
@@ -1 +1 @@
-27ea6f4c8468471875dc2362b2160f2c  globus_core-5.16.tar.gz
+ed456afa1ab9d9eeb6a7f427eecb4eb7  globus_core-5.17.tar.gz