rpms/globus-gram-job-manager-scripts/EL-4 globus-gram-job-manager-scripts-undefined.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 globus-gram-job-manager-scripts.patch, 1.1, 1.2 globus-gram-job-manager-scripts.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Mattias Ellert
ellert at fedoraproject.org
Tue Feb 9 09:42:55 UTC 2010
- Previous message: rpms/globus-gram-job-manager-scripts/EL-5 globus-gram-job-manager-scripts-undefined.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 globus-gram-job-manager-scripts.patch, 1.1, 1.2 globus-gram-job-manager-scripts.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
- Next message: File globus_gram_job_manager_scripts-2.4.tar.gz uploaded to lookaside cache by ellert
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ellert
Update of /cvs/pkgs/rpms/globus-gram-job-manager-scripts/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17878/EL-4
Modified Files:
.cvsignore globus-gram-job-manager-scripts.patch
globus-gram-job-manager-scripts.spec import.log sources
Added Files:
globus-gram-job-manager-scripts-undefined.patch
Log Message:
* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.4-1
- Update to Globus Toolkit 5.0.0
globus-gram-job-manager-scripts-undefined.patch:
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE globus-gram-job-manager-scripts-undefined.patch ---
diff -ur globus_gram_job_manager_scripts-0.7.orig/Makefile.am globus_gram_job_manager_scripts-0.7/Makefile.am
--- globus_gram_job_manager_scripts-0.7.orig/Makefile.am 2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/Makefile.am 2009-09-11 18:26:21.828603612 +0200
@@ -20,7 +20,7 @@
perldoc_DATA = JobManager.html JobDescription.html
# Files which we want to put in the source package
-EXTRA_DIST = $(libexec_SCRIPTS) $(globusperl_DATA) $(perldoc_DATA) $(noinst_DATA)
+EXTRA_DIST = $(libexec_SCRIPTS) $(globusperl_DATA) $(perldoc_DATA)
SUFFIXES = .pm .html
@@ -29,7 +29,7 @@
sed -e 's,</HEAD>,<LINK REL="stylesheet" HREF="../../../../doxygen/globus.css"></HEAD>,' > $*.html
-MAINTAINERCLEANFILES = $(perldoc_DATA) $(noinst_DATA)
+MAINTAINERCLEANFILES = $(perldoc_DATA)
include $(top_srcdir)/globus_automake_post
include $(top_srcdir)/globus_automake_post_top
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 3 Dec 2009 15:45:03 -0000 1.2
+++ .cvsignore 9 Feb 2010 09:42:55 -0000 1.3
@@ -1 +1 @@
-globus_gram_job_manager_scripts-0.7.tar.gz
+globus_gram_job_manager_scripts-2.4.tar.gz
globus-gram-job-manager-scripts.patch:
Makefile.am | 4 ++--
globus-job-manager-script.pl | 21 ++++-----------------
globus-job-manager-service | 31 ++++++++-----------------------
3 files changed, 14 insertions(+), 42 deletions(-)
Index: globus-gram-job-manager-scripts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/EL-4/globus-gram-job-manager-scripts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gram-job-manager-scripts.patch 3 Dec 2009 15:45:03 -0000 1.1
+++ globus-gram-job-manager-scripts.patch 9 Feb 2010 09:42:55 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl
---- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl 2008-08-15 13:19:59.000000000 +0200
-+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl 2009-07-31 20:19:41.868499889 +0200
+diff -ur globus_gram_job_manager_scripts-2.4.orig/globus-job-manager-script.pl globus_gram_job_manager_scripts-2.4/globus-job-manager-script.pl
+--- globus_gram_job_manager_scripts-2.4.orig/globus-job-manager-script.pl 2009-11-11 19:55:25.000000000 +0100
++++ globus_gram_job_manager_scripts-2.4/globus-job-manager-script.pl 2010-01-23 18:26:40.609533877 +0100
@@ -21,27 +21,14 @@
BEGIN
@@ -31,11 +31,11 @@ diff -ur globus_gram_job_manager_scripts
+use Globus::Core::Paths;
+my $path = $Globus::Core::Paths::libdir;
- if($^O eq 'irix')
- {
-diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service globus_gram_job_manager_scripts-0.7/globus-job-manager-service
---- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service 2008-08-15 11:14:45.000000000 +0200
-+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-service 2009-07-31 20:27:38.925498454 +0200
+ my $library_map = {
+ 'linux' => [ 'LD_LIBRARY_PATH'],
+diff -ur globus_gram_job_manager_scripts-2.4.orig/globus-job-manager-service globus_gram_job_manager_scripts-2.4/globus-job-manager-service
+--- globus_gram_job_manager_scripts-2.4.orig/globus-job-manager-service 2009-11-19 18:53:49.000000000 +0100
++++ globus_gram_job_manager_scripts-2.4/globus-job-manager-service 2010-01-23 18:26:40.610532675 +0100
@@ -59,29 +59,17 @@
BEGIN
@@ -101,9 +101,9 @@ diff -ur globus_gram_job_manager_scripts
- "${libexecdir}/globus-job-manager globus-job-manager ".
+ "${sbindir}/globus-job-manager globus-job-manager ".
"-conf ${job_manager_conf} -type ${manager_type} ".
- "-machine-type unknown ".
- "-publish-jobs $extra_config\n";
-@@ -198,7 +183,7 @@
+ "$extra_config\n";
+
+@@ -197,7 +182,7 @@
{
my $name = $_[0];
@@ -112,9 +112,9 @@ diff -ur globus_gram_job_manager_scripts
{
return 1;
}
-diff -ur globus_gram_job_manager_scripts-0.7.orig/Makefile.am globus_gram_job_manager_scripts-0.7/Makefile.am
---- globus_gram_job_manager_scripts-0.7.orig/Makefile.am 2008-08-15 11:14:45.000000000 +0200
-+++ globus_gram_job_manager_scripts-0.7/Makefile.am 2009-07-31 20:42:05.504495513 +0200
+diff -ur globus_gram_job_manager_scripts-2.4.orig/Makefile.am globus_gram_job_manager_scripts-2.4/Makefile.am
+--- globus_gram_job_manager_scripts-2.4.orig/Makefile.am 2009-11-04 21:08:06.000000000 +0100
++++ globus_gram_job_manager_scripts-2.4/Makefile.am 2010-01-23 18:26:40.610532675 +0100
@@ -8,8 +8,8 @@
globus-job-manager-script.pl
Index: globus-gram-job-manager-scripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/EL-4/globus-gram-job-manager-scripts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gram-job-manager-scripts.spec 3 Dec 2009 15:45:03 -0000 1.1
+++ globus-gram-job-manager-scripts.spec 9 Feb 2010 09:42:55 -0000 1.2
@@ -2,7 +2,7 @@
Name: globus-gram-job-manager-scripts
%global _name %(tr - _ <<< %{name})
-Version: 0.7
+Version: 2.4
Release: 1%{?dist}
Summary: Globus Toolkit - GRAM Job ManagerScripts
@@ -11,15 +11,18 @@ BuildArch: noarch
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/gram/jobmanager/scripts globus_gram_job_manager_scripts-0.7
-# cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_scripts-0.7
-# tar -zcf globus_gram_job_manager_scripts-0.7.tar.gz globus_gram_job_manager_scripts-0.7
+# 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/gram/jobmanager/scripts globus_gram_job_manager_scripts-2.4
+# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_scripts-2.4
+# tar -zcf globus_gram_job_manager_scripts-2.4.tar.gz globus_gram_job_manager_scripts-2.4
Source: %{_name}-%{version}.tar.gz
# Fixes for FHS installation:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6822
Patch0: %{name}.patch
+# Undefined makefile variable:
+# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6855
+Patch1: %{name}-undefined.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-common-setup >= 2
@@ -57,6 +60,7 @@ GRAM Job ManagerScripts Documentation Fi
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
+%patch1 -p1
%build
# Remove files that should be replaced during bootstrap
@@ -117,5 +121,8 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM
%changelog
+* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.4-1
+- Update to Globus Toolkit 5.0.0
+
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 3 Dec 2009 15:45:03 -0000 1.1
+++ import.log 9 Feb 2010 09:42:55 -0000 1.2
@@ -1 +1,2 @@
globus-gram-job-manager-scripts-0_7-1_fc11:EL-4:globus-gram-job-manager-scripts-0.7-1.fc11.src.rpm:1259855087
+globus-gram-job-manager-scripts-2_4-1_fc12:EL-4:globus-gram-job-manager-scripts-2.4-1.fc12.src.rpm:1265708561
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 3 Dec 2009 15:45:03 -0000 1.2
+++ sources 9 Feb 2010 09:42:55 -0000 1.3
@@ -1 +1 @@
-f4cfd6a389952ea7326572eda17ef544 globus_gram_job_manager_scripts-0.7.tar.gz
+06f19f751d8b07cf2eedf15d6016bf16 globus_gram_job_manager_scripts-2.4.tar.gz
- Previous message: rpms/globus-gram-job-manager-scripts/EL-5 globus-gram-job-manager-scripts-undefined.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 globus-gram-job-manager-scripts.patch, 1.1, 1.2 globus-gram-job-manager-scripts.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
- Next message: File globus_gram_job_manager_scripts-2.4.tar.gz uploaded to lookaside cache by ellert
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list