rpms/globus-core/EL-5 globus-core-usr.patch, 1.1, 1.2 globus-core.spec, 1.6, 1.7 globus-spec-creator, 1.3, 1.4 import.log, 1.5, 1.6 sources, 1.2, 1.3
Mattias Ellert
ellert at fedoraproject.org
Tue Feb 9 07:22:49 UTC 2010
Author: ellert
Update of /cvs/pkgs/rpms/globus-core/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26388/EL-5
Modified Files:
globus-core-usr.patch globus-core.spec globus-spec-creator
import.log sources
Log Message:
* Thu Jan 21 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-8
- Update to Globus Toolkit 5.0.0
globus-core-usr.patch:
aclocal/acdoxygen.m4 | 5 +++--
aclocal/globus_package.m4 | 23 ++++++++++-------------
bootstrap | 26 +++++++++++---------------
configure.in | 13 ++-----------
doxygen/globus-build-doxygen-dependencies | 12 +++++++++---
doxygen/globus-update-doxygen-index | 9 ++++++---
scripts/globus-bootstrap.sh | 29 +++++++++++++++++++++++------
7 files changed, 64 insertions(+), 53 deletions(-)
Index: globus-core-usr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/globus-core-usr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-core-usr.patch 20 Mar 2009 07:33:41 -0000 1.1
+++ globus-core-usr.patch 9 Feb 2010 07:22:49 -0000 1.2
@@ -76,7 +76,6 @@ diff -ur globus_core-5.15.orig/aclocal/g
AC_SUBST(LIBTOOL)
AC_SUBST(LN_S)
])
-Endast i globus_core-5.15/aclocal: globus_package.m4.orig
diff -ur globus_core-5.15.orig/bootstrap globus_core-5.15/bootstrap
--- globus_core-5.15.orig/bootstrap 2004-08-24 17:36:59.000000000 +0200
+++ globus_core-5.15/bootstrap 2008-10-21 09:57:03.000000000 +0200
Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/globus-core.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- globus-core.spec 25 Jul 2009 07:27:15 -0000 1.6
+++ globus-core.spec 9 Feb 2010 07:22:49 -0000 1.7
@@ -13,16 +13,16 @@
Name: globus-core
%global _name %(tr - _ <<< %{name})
Version: 5.15
-Release: 6%{?dist}
+Release: 8%{?dist}
Summary: Globus Toolkit - Globus Core
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/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/core/source globus_core-5.15
+# 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/core/source globus_core-5.15
# tar -zcf globus_core-5.15.tar.gz globus_core-5.15
Source: %{_name}-%{version}.tar.gz
# GPT metadata to pkg-config file converter
@@ -208,6 +208,12 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%changelog
+* Thu Jan 21 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-8
+- Update to Globus Toolkit 5.0.0
+
+* Mon Dec 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-7
+- rebuild against perl 5.10.1
+
* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-6
- The globus-spec-creator script now uses isa tags and noarch doc subpackages
- Replace /usr/bin/env shebangs
Index: globus-spec-creator
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/globus-spec-creator,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-spec-creator 25 Jul 2009 07:27:15 -0000 1.3
+++ globus-spec-creator 9 Feb 2010 07:22:49 -0000 1.4
@@ -12,7 +12,7 @@ my $setupfile;
my $release = "1";
my $directory;
my $setupdirectory;
-my $toolkitversion = "4.2.1";
+my $toolkitversion = "5.0.0";
my $email;
my $nodoc;
my $help;
@@ -39,6 +39,14 @@ my $host = hostname;
$email = "$login\@$host" unless defined $email;
+ at versions = split(/\./, $toolkitversion);
+if (@versions[0] < 5) {
+ $sourcedir = "gt at versions[0]/$toolkitversion";
+}
+else {
+ $sourcedir = "gt at versions[0]/@versions[0]. at versions[1]/$toolkitversion";
+}
+
if (defined $directory) {
$setupdirectory = $directory;
$setupdirectory =~ s![^/]*$!setup!;
@@ -214,7 +222,7 @@ else {
print "License:\tASL 2.0\n";
print "URL:\t\thttp://www.globus.org/\n";
print "#\t\tSource is extracted from the globus toolkit installer:\n";
-print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
+print "#\t\twget -N http://www-unix.globus.org/ftppub/$sourcedir/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($directory ? $directory : "###DIRECTORY###") . " $gptname-$version\n";
print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $gptname-$version\n"
@@ -223,7 +231,7 @@ print "#\t\ttar -zcf $gptname-$version.t
print "Source:\t\t%{_name}-%{version}.tar.gz\n";
if (defined $setupfile) {
print "#\t\tSource1 is extracted from the globus toolkit installer:\n";
- print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
+ print "#\t\twget -N http://www-unix.globus.org/ftppub/$sourcedir/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($setupdirectory ? $setupdirectory : "###DIRECTORY###") . " $setupname-$setupversion\n";
print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $setupname-$setupversion\n";
@@ -721,7 +729,7 @@ The package's source directory in the to
=item B<-toolkitversion> versionnumber
-Globus toolkit version (default: 4.2.1)
+Globus toolkit version (default: 5.0.0)
=item B<-email> emailaddress
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log 15 Jun 2009 15:13:00 -0000 1.5
+++ import.log 9 Feb 2010 07:22:49 -0000 1.6
@@ -3,3 +3,4 @@ globus-core-5_15-2_fc9:EL-5:globus-core-
globus-core-5_15-3_fc9:EL-5:globus-core-5.15-3.fc9.src.rpm:1240326177
globus-core-5_15-4_fc9:EL-5:globus-core-5.15-4.fc9.src.rpm:1240851250
globus-core-5_15-5_fc9:EL-5:globus-core-5.15-5.fc9.src.rpm:1245078754
+globus-core-5_15-8_fc12:EL-5:globus-core-5.15-8.fc12.src.rpm:1265700153
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 20 Mar 2009 07:33:41 -0000 1.2
+++ sources 9 Feb 2010 07:22:49 -0000 1.3
@@ -1 +1 @@
-926e3cc1a6eef6e7fc9727aae73e3930 globus_core-5.15.tar.gz
+9af249e45052c887fcc926002bd244e5 globus_core-5.15.tar.gz
More information about the scm-commits
mailing list