rpms/globus-gram-job-manager/EL-4 .cvsignore, 1.3, 1.4 globus-gram-job-manager.patch, 1.1, 1.2 globus-gram-job-manager.spec, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.3, 1.4
Mattias Ellert
ellert at fedoraproject.org
Sat Jul 17 19:46:58 UTC 2010
- Previous message: rpms/globus-gram-job-manager/EL-5 .cvsignore, 1.3, 1.4 globus-gram-job-manager.patch, 1.1, 1.2 globus-gram-job-manager.spec, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.3, 1.4
- Next message: File globus_rls_server-4.9.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/EL-4
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12033/EL-4
Modified Files:
.cvsignore globus-gram-job-manager.patch
globus-gram-job-manager.spec import.log sources
Log Message:
* Sat Jul 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.59-1
- Update to Globus Toolkit 5.0.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 16 Apr 2010 16:26:28 -0000 1.3
+++ .cvsignore 17 Jul 2010 19:46:57 -0000 1.4
@@ -1,2 +1,2 @@
-globus_gram_job_manager-10.42.tar.gz
+globus_gram_job_manager-10.59.tar.gz
globus_gram_job_manager_setup-4.3.tar.gz
globus-gram-job-manager.patch:
Makefile.am | 4 -
configuration.dox | 10 ++--
globus-personal-gatekeeper | 43 ++++++-----------
globus_gram_job_manager.c | 3 -
globus_gram_job_manager_config.c | 11 ----
globus_gram_job_manager_request.c | 15 +++---
globus_gram_job_manager_script.c | 67 ++++++++++++++++++++-------
globus_gram_job_manager_script_interface.dox | 30 ++----------
globus_gram_job_manager_script_tutorial.dox | 4 -
globus_gram_job_manager_state_file.c | 3 -
globus_gram_job_manager_validate.c | 6 +-
globus_gram_streamer.c | 2
globus_job_manager_rsl_validation.dox | 19 -------
job_execution_environment.dox | 4 -
main.dox | 2
pkgdata/MyFilelists.pm | 12 +++-
scripts/create_rsl_documentation.pl | 13 ++++-
17 files changed, 124 insertions(+), 124 deletions(-)
Index: globus-gram-job-manager.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager/EL-4/globus-gram-job-manager.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gram-job-manager.patch 31 Mar 2010 07:15:31 -0000 1.1
+++ globus-gram-job-manager.patch 17 Jul 2010 19:46:58 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ur globus_gram_job_manager-10.17.orig/configuration.dox globus_gram_job_manager-10.17/configuration.dox
---- globus_gram_job_manager-10.17.orig/configuration.dox 2009-09-24 21:09:38.000000000 +0200
-+++ globus_gram_job_manager-10.17/configuration.dox 2010-01-29 05:27:38.244767236 +0100
+diff -ur globus_gram_job_manager-10.59.orig/configuration.dox globus_gram_job_manager-10.59/configuration.dox
+--- globus_gram_job_manager-10.59.orig/configuration.dox 2009-09-24 21:09:38.000000000 +0200
++++ globus_gram_job_manager-10.59/configuration.dox 2010-07-17 11:52:01.369553548 +0200
@@ -6,7 +6,7 @@
which may be passed to the GRAM Job Manager in the configuration
file <code>$GLOBUS_LOCATION/etc/globus-job-manager.conf</code>.
@@ -33,10 +33,10 @@ diff -ur globus_gram_job_manager-10.17.o
+ at par -single
Use the single job manager per user/jobmanager type feature
*/
-diff -ur globus_gram_job_manager-10.17.orig/globus_gram_job_manager.c globus_gram_job_manager-10.17/globus_gram_job_manager.c
---- globus_gram_job_manager-10.17.orig/globus_gram_job_manager.c 2009-12-17 00:25:48.000000000 +0100
-+++ globus_gram_job_manager-10.17/globus_gram_job_manager.c 2010-01-29 06:00:06.130013515 +0100
-@@ -1863,7 +1863,8 @@
+diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager.c globus_gram_job_manager-10.59/globus_gram_job_manager.c
+--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager.c 2010-07-01 21:18:09.000000000 +0200
++++ globus_gram_job_manager-10.59/globus_gram_job_manager.c 2010-07-17 11:52:01.370553534 +0200
+@@ -2101,7 +2101,8 @@
{
state_dir_path = globus_common_create_string(
"%s/tmp/gram_job_state/",
@@ -46,10 +46,10 @@ diff -ur globus_gram_job_manager-10.17.o
}
else
{
-diff -ur globus_gram_job_manager-10.17.orig/globus_gram_job_manager_config.c globus_gram_job_manager-10.17/globus_gram_job_manager_config.c
---- globus_gram_job_manager-10.17.orig/globus_gram_job_manager_config.c 2009-12-17 00:25:48.000000000 +0100
-+++ globus_gram_job_manager-10.17/globus_gram_job_manager_config.c 2010-01-29 06:29:58.102013906 +0100
-@@ -459,17 +459,6 @@
+diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_config.c globus_gram_job_manager-10.59/globus_gram_job_manager_config.c
+--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_config.c 2010-06-10 14:49:14.000000000 +0200
++++ globus_gram_job_manager-10.59/globus_gram_job_manager_config.c 2010-07-17 11:52:01.370553534 +0200
+@@ -468,17 +468,6 @@
goto out;
}
}
@@ -67,10 +67,10 @@ diff -ur globus_gram_job_manager-10.17.o
if (config->scratch_dir_base == NULL)
{
config->scratch_dir_base = strdup(
-diff -ur globus_gram_job_manager-10.17.orig/globus_gram_job_manager_request.c globus_gram_job_manager-10.17/globus_gram_job_manager_request.c
---- globus_gram_job_manager-10.17.orig/globus_gram_job_manager_request.c 2009-12-17 00:25:48.000000000 +0100
-+++ globus_gram_job_manager-10.17/globus_gram_job_manager_request.c 2010-01-29 06:05:56.485762259 +0100
-@@ -2381,13 +2381,16 @@
+diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_request.c globus_gram_job_manager-10.59/globus_gram_job_manager_request.c
+--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_request.c 2010-06-10 14:49:15.000000000 +0200
++++ globus_gram_job_manager-10.59/globus_gram_job_manager_request.c 2010-07-17 11:52:01.371553590 +0200
+@@ -2321,13 +2321,16 @@
goto add_gram_job_contact_failed;
}
@@ -93,10 +93,10 @@ diff -ur globus_gram_job_manager-10.17.o
}
if (request->config->tcp_port_range)
-diff -ur globus_gram_job_manager-10.17.orig/globus_gram_job_manager_script.c globus_gram_job_manager-10.17/globus_gram_job_manager_script.c
---- globus_gram_job_manager-10.17.orig/globus_gram_job_manager_script.c 2009-10-20 18:58:55.000000000 +0200
-+++ globus_gram_job_manager-10.17/globus_gram_job_manager_script.c 2010-01-29 06:42:28.877763635 +0100
-@@ -702,7 +702,6 @@
+diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_script.c globus_gram_job_manager-10.59/globus_gram_job_manager_script.c
+--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_script.c 2010-06-10 14:49:15.000000000 +0200
++++ globus_gram_job_manager-10.59/globus_gram_job_manager_script.c 2010-07-17 11:52:01.372554834 +0200
+@@ -737,7 +737,6 @@
char * job_contact_match = 0;
if( ! request ||
@@ -104,7 +104,7 @@ diff -ur globus_gram_job_manager-10.17.o
!request->job_contact)
{
goto FAST_POLL_EXIT_FAILURE;
-@@ -721,7 +720,8 @@
+@@ -756,7 +755,8 @@
*/
grid_monitor_files[0] = globus_common_create_string(
"%s%s%d",
@@ -114,7 +114,7 @@ diff -ur globus_gram_job_manager-10.17.o
GRID_MONITOR_LOCATION_1,
(int)this_uid);
if( ! grid_monitor_files[0])
-@@ -731,7 +731,8 @@
+@@ -766,7 +766,8 @@
grid_monitor_files[1] = globus_common_create_string(
"%s%s%d",
@@ -124,7 +124,7 @@ diff -ur globus_gram_job_manager-10.17.o
GRID_MONITOR_LOCATION_2,
(int)this_uid);
if( ! grid_monitor_files[1])
-@@ -1775,9 +1776,18 @@
+@@ -1856,9 +1857,18 @@
*/
/*---------------- job manager script -----------------*/
@@ -146,7 +146,7 @@ diff -ur globus_gram_job_manager-10.17.o
if (stat(script_path, &statbuf) != 0)
{
-@@ -1789,14 +1799,14 @@
+@@ -1870,14 +1880,14 @@
"event=gram.request_validate.end "
"level=ERROR "
"gramid=%s "
@@ -163,7 +163,7 @@ diff -ur globus_gram_job_manager-10.17.o
"Script status failed",
-rc,
errno,
-@@ -1815,12 +1825,12 @@
+@@ -1896,12 +1906,12 @@
"event=gram.request_validate.end "
"level=ERROR "
"gramid=%s "
@@ -178,7 +178,7 @@ diff -ur globus_gram_job_manager-10.17.o
"Script not executable",
-rc);
-@@ -1830,6 +1840,11 @@
+@@ -1911,6 +1921,11 @@
/*
* Verify existence/executableness of scheduler specific script.
*/
@@ -190,7 +190,7 @@ diff -ur globus_gram_job_manager-10.17.o
sprintf(script_path, "%s/lib/perl/Globus/GRAM/JobManager/%s.pm",
location,
request->config->jobmanager_type);
-@@ -1860,6 +1875,7 @@
+@@ -1941,6 +1956,7 @@
goto free_location_exit;
}
@@ -198,7 +198,7 @@ diff -ur globus_gram_job_manager-10.17.o
globus_gram_job_manager_request_log(
request,
-@@ -1872,7 +1888,8 @@
+@@ -1953,7 +1969,8 @@
0);
free_location_exit:
@@ -208,7 +208,7 @@ diff -ur globus_gram_job_manager-10.17.o
return rc;
}
/* globus_l_gram_request_validate() */
-@@ -2388,10 +2405,23 @@
+@@ -2473,10 +2490,23 @@
char * pipe_cmd[6];
char * env[7];
int i;
@@ -235,7 +235,7 @@ diff -ur globus_gram_job_manager-10.17.o
if (pipe_cmd[0] == NULL)
{
rc = GLOBUS_GRAM_PROTOCOL_ERROR_MALLOC_FAILED;
-@@ -2411,9 +2441,12 @@
+@@ -2496,9 +2526,12 @@
memset(env, 0, sizeof(env));
i = 0;
@@ -251,9 +251,9 @@ diff -ur globus_gram_job_manager-10.17.o
env[i++] = globus_common_create_string(
"GLOBUS_SPOOL_DIR=%s",
manager->config->job_state_file_dir);
-diff -ur globus_gram_job_manager-10.17.orig/globus_gram_job_manager_script_interface.dox globus_gram_job_manager-10.17/globus_gram_job_manager_script_interface.dox
---- globus_gram_job_manager-10.17.orig/globus_gram_job_manager_script_interface.dox 2002-08-08 22:57:18.000000000 +0200
-+++ globus_gram_job_manager-10.17/globus_gram_job_manager_script_interface.dox 2010-01-29 05:27:38.245767012 +0100
+diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_script_interface.dox globus_gram_job_manager-10.59/globus_gram_job_manager_script_interface.dox
+--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_script_interface.dox 2002-08-08 22:57:18.000000000 +0200
++++ globus_gram_job_manager-10.59/globus_gram_job_manager_script_interface.dox 2010-07-17 11:52:01.373554331 +0200
@@ -7,9 +7,7 @@
Manager. These are:
<dl>
@@ -326,9 +326,9 @@ diff -ur globus_gram_job_manager-10.17.o
<b>GRAM_My_Job</b>.
</dd>
</dl>
-diff -ur globus_gram_job_manager-10.17.orig/globus_gram_job_manager_script_tutorial.dox globus_gram_job_manager-10.17/globus_gram_job_manager_script_tutorial.dox
---- globus_gram_job_manager-10.17.orig/globus_gram_job_manager_script_tutorial.dox 2008-08-15 11:33:05.000000000 +0200
-+++ globus_gram_job_manager-10.17/globus_gram_job_manager_script_tutorial.dox 2010-01-29 05:27:38.245767012 +0100
+diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_script_tutorial.dox globus_gram_job_manager-10.59/globus_gram_job_manager_script_tutorial.dox
+--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_script_tutorial.dox 2008-08-15 11:33:05.000000000 +0200
++++ globus_gram_job_manager-10.59/globus_gram_job_manager_script_tutorial.dox 2010-07-17 11:52:01.373554331 +0200
@@ -63,7 +63,7 @@
}
@endcode
@@ -347,9 +347,9 @@ diff -ur globus_gram_job_manager-10.17.o
installed into the setup directory. We need to add those files plus our
documentation source file to the EXTRA_LIST variable so that they
will be included in source distributions. The rest of the lines in the
-diff -ur globus_gram_job_manager-10.17.orig/globus_gram_job_manager_state_file.c globus_gram_job_manager-10.17/globus_gram_job_manager_state_file.c
---- globus_gram_job_manager-10.17.orig/globus_gram_job_manager_state_file.c 2009-10-29 15:36:39.000000000 +0100
-+++ globus_gram_job_manager-10.17/globus_gram_job_manager_state_file.c 2010-01-29 06:00:44.521013776 +0100
+diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_state_file.c globus_gram_job_manager-10.59/globus_gram_job_manager_state_file.c
+--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_state_file.c 2010-07-07 22:59:07.000000000 +0200
++++ globus_gram_job_manager-10.59/globus_gram_job_manager_state_file.c 2010-07-17 11:52:01.374553410 +0200
@@ -50,7 +50,8 @@
{
*state_file = globus_common_create_string(
@@ -360,10 +360,10 @@ diff -ur globus_gram_job_manager-10.17.o
request->config->logname,
request->config->hostname,
request->uniq_id);
-diff -ur globus_gram_job_manager-10.17.orig/globus_gram_job_manager_validate.c globus_gram_job_manager-10.17/globus_gram_job_manager_validate.c
---- globus_gram_job_manager-10.17.orig/globus_gram_job_manager_validate.c 2009-10-08 21:48:22.000000000 +0200
-+++ globus_gram_job_manager-10.17/globus_gram_job_manager_validate.c 2010-01-29 06:08:04.614763190 +0100
-@@ -146,7 +146,8 @@
+diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_validate.c globus_gram_job_manager-10.59/globus_gram_job_manager_validate.c
+--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_validate.c 2010-06-03 19:45:57.000000000 +0200
++++ globus_gram_job_manager-10.59/globus_gram_job_manager_validate.c 2010-07-17 11:52:01.375553815 +0200
+@@ -134,7 +134,8 @@
validation_filename = globus_common_create_string(
"%s/share/globus_gram_job_manager/%s.rvf",
@@ -373,7 +373,7 @@ diff -ur globus_gram_job_manager-10.17.o
"globus-gram-job-manager");
if(validation_filename == NULL)
-@@ -156,7 +157,8 @@
+@@ -144,7 +145,8 @@
}
scheduler_validation_filename = globus_common_create_string(
"%s/share/globus_gram_job_manager/%s.rvf",
@@ -383,9 +383,21 @@ diff -ur globus_gram_job_manager-10.17.o
manager->config->jobmanager_type);
if(scheduler_validation_filename == NULL)
{
-diff -ur globus_gram_job_manager-10.17.orig/globus_job_manager_rsl_validation.dox globus_gram_job_manager-10.17/globus_job_manager_rsl_validation.dox
---- globus_gram_job_manager-10.17.orig/globus_job_manager_rsl_validation.dox 2002-08-08 22:57:20.000000000 +0200
-+++ globus_gram_job_manager-10.17/globus_job_manager_rsl_validation.dox 2010-01-29 05:27:38.245767012 +0100
+diff -ur globus_gram_job_manager-10.59.orig/globus_gram_streamer.c globus_gram_job_manager-10.59/globus_gram_streamer.c
+--- globus_gram_job_manager-10.59.orig/globus_gram_streamer.c 2010-06-10 14:49:15.000000000 +0200
++++ globus_gram_job_manager-10.59/globus_gram_streamer.c 2010-07-17 12:00:25.632553798 +0200
+@@ -14,7 +14,7 @@
+ * limitations under the License.
+ */
+
+-/**
++/*
+ * @file globus_gram_streamer.c GRAM File Streamer Application
+ *
+ * @details
+diff -ur globus_gram_job_manager-10.59.orig/globus_job_manager_rsl_validation.dox globus_gram_job_manager-10.59/globus_job_manager_rsl_validation.dox
+--- globus_gram_job_manager-10.59.orig/globus_job_manager_rsl_validation.dox 2002-08-08 22:57:20.000000000 +0200
++++ globus_gram_job_manager-10.59/globus_job_manager_rsl_validation.dox 2010-07-17 11:52:01.375553815 +0200
@@ -9,9 +9,6 @@
attribute may be used, it's default value, and the format of the attribute's
value.
@@ -450,9 +462,9 @@ diff -ur globus_gram_job_manager-10.17.o
- at verbinclude "globus-gram-job-manager.rvf"
-
-*/
-diff -ur globus_gram_job_manager-10.17.orig/globus-personal-gatekeeper globus_gram_job_manager-10.17/globus-personal-gatekeeper
---- globus_gram_job_manager-10.17.orig/globus-personal-gatekeeper 2009-10-08 21:48:20.000000000 +0200
-+++ globus_gram_job_manager-10.17/globus-personal-gatekeeper 2010-01-29 05:27:38.246766788 +0100
+diff -ur globus_gram_job_manager-10.59.orig/globus-personal-gatekeeper globus_gram_job_manager-10.59/globus-personal-gatekeeper
+--- globus_gram_job_manager-10.59.orig/globus-personal-gatekeeper 2010-06-10 14:49:14.000000000 +0200
++++ globus_gram_job_manager-10.59/globus-personal-gatekeeper 2010-07-17 11:52:56.486560906 +0200
@@ -16,14 +16,6 @@
# limitations under the License.
#
@@ -495,18 +507,18 @@ diff -ur globus_gram_job_manager-10.17.o
short_usage="globus-personal-gatekeeper [-help] [-start] [-list] [-killall] ..."
-@@ -106,10 +99,6 @@
- {
+@@ -107,10 +100,6 @@
+ hours=""
${debug} "verifying setup..."
- bindir="${GLOBUS_LOCATION}/bin"
- sbindir="${GLOBUS_LOCATION}/sbin"
- libexecdir="${GLOBUS_LOCATION}/libexec"
-
- ${bindir}/grid-proxy-info -exists -hours 1
-
- if [ $? -ne 0 ]; then
-@@ -444,18 +433,17 @@
+ if test "$1" != 'kill'; then
+ hours="-hours 1"
+ fi
+@@ -448,18 +437,17 @@
exit 1
fi
${GLOBUS_SH_CAT-cat} > ${scratch}/jobmanager <<EOF
@@ -528,7 +540,7 @@ diff -ur globus_gram_job_manager-10.17.o
-logfile ${scratch}/gatekeeper.log
-grid_services ${scratch}
-d
-@@ -470,7 +458,7 @@
+@@ -474,7 +462,7 @@
fi
@@ -537,7 +549,7 @@ diff -ur globus_gram_job_manager-10.17.o
host_cputype=`echo $host_info | ${GLOBUS_SH_AWK-awk} -F'-' '{print $1}'`
host_manufacturer=`echo $host_info | ${GLOBUS_SH_AWK-awk} -F'-' '{print $2}'`
host_osname=`${GLOBUS_SH_UNAME-uname} -s`
-@@ -481,7 +469,6 @@
+@@ -485,7 +473,6 @@
fi
${GLOBUS_SH_CAT-cat} > ${scratch}/jobmanager.conf <<EOF
@@ -545,7 +557,7 @@ diff -ur globus_gram_job_manager-10.17.o
-type ${jmtype}
-globus-gatekeeper-subject "${subject}"
-globus-host-cputype ${host_cputype}
-@@ -499,8 +486,8 @@
+@@ -503,8 +490,8 @@
if [ ! -z "${auditdir}" ]; then
@@ -556,9 +568,9 @@ diff -ur globus_gram_job_manager-10.17.o
else
globus_toolkit_version="Unknown"
fi
-diff -ur globus_gram_job_manager-10.17.orig/job_execution_environment.dox globus_gram_job_manager-10.17/job_execution_environment.dox
---- globus_gram_job_manager-10.17.orig/job_execution_environment.dox 2009-09-24 21:09:39.000000000 +0200
-+++ globus_gram_job_manager-10.17/job_execution_environment.dox 2010-01-29 05:27:38.246766788 +0100
+diff -ur globus_gram_job_manager-10.59.orig/job_execution_environment.dox globus_gram_job_manager-10.59/job_execution_environment.dox
+--- globus_gram_job_manager-10.59.orig/job_execution_environment.dox 2009-09-24 21:09:39.000000000 +0200
++++ globus_gram_job_manager-10.59/job_execution_environment.dox 2010-07-17 11:52:01.376552823 +0200
@@ -1,7 +1,7 @@
/**
@page globus_gram_job_manager_job_execution_environment Job Execution Environment
@@ -577,9 +589,9 @@ diff -ur globus_gram_job_manager-10.17.o
In addition to the environment variables described above, a number of RSL
substitutions are made available by the job manager. These substitions
-diff -ur globus_gram_job_manager-10.17.orig/main.dox globus_gram_job_manager-10.17/main.dox
---- globus_gram_job_manager-10.17.orig/main.dox 2002-08-08 22:57:21.000000000 +0200
-+++ globus_gram_job_manager-10.17/main.dox 2010-01-29 05:27:38.247766773 +0100
+diff -ur globus_gram_job_manager-10.59.orig/main.dox globus_gram_job_manager-10.59/main.dox
+--- globus_gram_job_manager-10.59.orig/main.dox 2002-08-08 22:57:21.000000000 +0200
++++ globus_gram_job_manager-10.59/main.dox 2010-07-17 11:52:01.376552823 +0200
@@ -10,6 +10,6 @@
- @ref globus_gram_job_manager_configuration
- @ref globus_gram_job_manager_rsl_validation_file
@@ -588,21 +600,30 @@ diff -ur globus_gram_job_manager-10.17.o
+- @ref globus_gram_job_manager_rsl
- @ref globus_gram_job_manager_script_interface
*/
-diff -ur globus_gram_job_manager-10.17.orig/Makefile.am globus_gram_job_manager-10.17/Makefile.am
---- globus_gram_job_manager-10.17.orig/Makefile.am 2009-10-29 15:36:39.000000000 +0100
-+++ globus_gram_job_manager-10.17/Makefile.am 2010-01-29 05:27:38.247766773 +0100
+diff -ur globus_gram_job_manager-10.59.orig/Makefile.am globus_gram_job_manager-10.59/Makefile.am
+--- globus_gram_job_manager-10.59.orig/Makefile.am 2010-06-10 14:49:14.000000000 +0200
++++ globus_gram_job_manager-10.59/Makefile.am 2010-07-17 17:17:39.650560578 +0200
@@ -8,7 +8,7 @@
# Where targets are installed
noinst_LTLIBRARIES = libglobus_gram_job_manager_$(GLOBUS_FLAVOR_NAME).la
--libexec_PROGRAMS = globus-job-manager globus-job-manager-lock-test
-+sbin_PROGRAMS = globus-job-manager globus-job-manager-lock-test
+-libexec_PROGRAMS = globus-job-manager globus-gram-streamer globus-job-manager-lock-test
++sbin_PROGRAMS = globus-job-manager globus-gram-streamer globus-job-manager-lock-test
libexec_SCRIPTS = globus-personal-gatekeeper-version.sh
bin_SCRIPTS = globus-personal-gatekeeper
-diff -ur globus_gram_job_manager-10.17.orig/pkgdata/MyFilelists.pm globus_gram_job_manager-10.17/pkgdata/MyFilelists.pm
---- globus_gram_job_manager-10.17.orig/pkgdata/MyFilelists.pm 2002-08-08 22:57:23.000000000 +0200
-+++ globus_gram_job_manager-10.17/pkgdata/MyFilelists.pm 2010-01-29 05:27:38.247766773 +0100
+@@ -49,7 +49,7 @@
+
+ globus_gram_streamer_LDFLAGS = $(GPT_LDFLAGS)
+ globus_gram_streamer_LDADD = \
+- ./libglobus_gram_job_manager_$(GLOBUS_FLAVOR_NAME).la -lglobus_gass_transfer_$(GLOBUS_FLAVOR_NAME) $(GPT_PGM_LINKS)
++ ./libglobus_gram_job_manager_$(GLOBUS_FLAVOR_NAME).la $(GPT_PGM_LINKS)
+
+ man1datadir=$(mandir)/man1
+ man1data_DATA = globus-personal-gatekeeper.1
+diff -ur globus_gram_job_manager-10.59.orig/pkgdata/MyFilelists.pm globus_gram_job_manager-10.59/pkgdata/MyFilelists.pm
+--- globus_gram_job_manager-10.59.orig/pkgdata/MyFilelists.pm 2002-08-08 22:57:23.000000000 +0200
++++ globus_gram_job_manager-10.59/pkgdata/MyFilelists.pm 2010-07-17 11:52:01.377553508 +0200
@@ -20,13 +20,19 @@
sub rtl_files {
my $self = shift;
@@ -641,9 +662,9 @@ diff -ur globus_gram_job_manager-10.17.o
$list = $self->{'filelist'}->get_list();
push @$result, @$list;
$self->{'filelist'}->reset();
-diff -ur globus_gram_job_manager-10.17.orig/scripts/create_rsl_documentation.pl globus_gram_job_manager-10.17/scripts/create_rsl_documentation.pl
---- globus_gram_job_manager-10.17.orig/scripts/create_rsl_documentation.pl 2009-11-04 20:53:26.000000000 +0100
-+++ globus_gram_job_manager-10.17/scripts/create_rsl_documentation.pl 2010-01-29 05:27:38.247766773 +0100
+diff -ur globus_gram_job_manager-10.59.orig/scripts/create_rsl_documentation.pl globus_gram_job_manager-10.59/scripts/create_rsl_documentation.pl
+--- globus_gram_job_manager-10.59.orig/scripts/create_rsl_documentation.pl 2009-11-04 20:53:19.000000000 +0100
++++ globus_gram_job_manager-10.59/scripts/create_rsl_documentation.pl 2010-07-17 11:52:01.377553508 +0200
@@ -18,7 +18,7 @@
/* this page was automatically generated by $0 */
Index: globus-gram-job-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager/EL-4/globus-gram-job-manager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-gram-job-manager.spec 5 Jun 2010 16:55:24 -0000 1.3
+++ globus-gram-job-manager.spec 17 Jul 2010 19:46:58 -0000 1.4
@@ -6,26 +6,26 @@
Name: globus-gram-job-manager
%global _name %(tr - _ <<< %{name})
-Version: 10.42
+Version: 10.59
%global setupversion 4.3
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Globus Toolkit - GRAM Jobmanager
Group: Applications/Internet
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/gram/jobmanager/source globus_gram_job_manager-10.42
-# cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager-10.42
-# tar -zcf globus_gram_job_manager-10.42.tar.gz globus_gram_job_manager-10.42
+# 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/gram/jobmanager/source globus_gram_job_manager-10.59
+# cp -p gt5.0.2-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager-10.59
+# tar -zcf globus_gram_job_manager-10.59.tar.gz globus_gram_job_manager-10.59
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/gram/jobmanager/setup/program globus_gram_job_manager_setup-4.3
-# cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_setup-4.3
+# 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/gram/jobmanager/setup/program globus_gram_job_manager_setup-4.3
+# cp -p gt5.0.2-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_setup-4.3
# tar -zcf globus_gram_job_manager_setup-4.3.tar.gz globus_gram_job_manager_setup-4.3
Source1: %{_name}_setup-%{setupversion}.tar.gz
# Fixes for FHS installation:
@@ -43,6 +43,7 @@ Patch3: %{name}-pathmax.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: %{name}-setup = %{setupversion}
+Requires: globus-common >= 11.5
Requires: globus-xio-popen-driver%{?_isa} >= 0.7
Requires: globus-libxml2%{?_isa}
Requires: globus-gram-protocol >= 9
@@ -57,17 +58,18 @@ BuildRequires: globus-scheduler-event-ge
BuildRequires: globus-xio-popen-driver-devel%{?_isa} >= 0.7
BuildRequires: globus-xio-devel%{?_isa} >= 2
BuildRequires: globus-gss-assist-devel%{?_isa} >= 3
+BuildRequires: globus-core%{?_isa} >= 4
+BuildRequires: globus-gsi-sysconfig-devel%{?_isa} >= 1
+BuildRequires: globus-rsl-assist-devel%{?_isa} >= 2
BuildRequires: globus-callout-devel%{?_isa}
BuildRequires: globus-gram-job-manager-callout-error-devel%{?_isa}
-BuildRequires: globus-core%{?_isa} >= 4
BuildRequires: globus-gram-protocol-devel%{?_isa} >= 9
BuildRequires: globus-common-devel%{?_isa} >= 3
-BuildRequires: globus-gsi-sysconfig-devel%{?_isa} >= 1
BuildRequires: globus-usage-devel%{?_isa} >= 1
-BuildRequires: globus-rsl-assist-devel%{?_isa} >= 2
BuildRequires: globus-rsl-devel%{?_isa} >= 3
-BuildRequires: globus-libxml2-devel%{?_isa}
BuildRequires: globus-gass-cache-devel%{?_isa} >= 5
+BuildRequires: globus-libxml2-devel%{?_isa}
+BuildRequires: globus-gass-transfer-devel%{?_isa} >= 4
BuildRequires: globus-gram-protocol-doc >= 9
BuildRequires: globus-common-doc
BuildRequires: doxygen
@@ -183,6 +185,9 @@ EOF
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-personal-gatekeeper-version.sh
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-gram-job-manager.pl
+# Create the service setup directory
+mkdir $RPM_BUILD_ROOT/%{_datadir}/globus/packages/setup/%{_name}_service_setup
+
GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
# Move files into globus tree
@@ -236,8 +241,8 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%dir %{_datadir}/globus/packages/%{_name}_setup
-%{_datadir}/globus/packages/setup
-%dir %{_datadir}/globus/setup
+%{_datadir}/globus/packages/setup/%{_name}_setup
+%dir %{_datadir}/globus/packages/setup/%{_name}_service_setup
%files doc -f package-doc.filelist
%defattr(-,root,root,-)
@@ -246,6 +251,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-setup-%{setupversion}/html
%changelog
+* Sat Jul 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.59-1
+- Update to Globus Toolkit 5.0.2
+
* Sat Jun 05 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.42-2
- Additional portability fixes
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager/EL-4/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log 5 Jun 2010 16:55:24 -0000 1.3
+++ import.log 17 Jul 2010 19:46:58 -0000 1.4
@@ -1,3 +1,4 @@
globus-gram-job-manager-10_17-1_fc12:EL-4:globus-gram-job-manager-10.17-1.fc12.src.rpm:1270019715
globus-gram-job-manager-10_42-1_fc12:EL-4:globus-gram-job-manager-10.42-1.fc12.src.rpm:1271435170
globus-gram-job-manager-10_42-2_fc12:EL-4:globus-gram-job-manager-10.42-2.fc12.src.rpm:1275756909
+globus-gram-job-manager-10_59-1_fc12:EL-4:globus-gram-job-manager-10.59-1.fc12.src.rpm:1279396001
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 16 Apr 2010 16:26:28 -0000 1.3
+++ sources 17 Jul 2010 19:46:58 -0000 1.4
@@ -1,2 +1,2 @@
-8620e648aba34c55e0e7b937b7fea006 globus_gram_job_manager-10.42.tar.gz
-ae44b40afa8a6c933da6db847a80de67 globus_gram_job_manager_setup-4.3.tar.gz
+7aa63bf9c3487413757f68c215694b61 globus_gram_job_manager-10.59.tar.gz
+c5fc4a7192c93c97f97cc9230d8e097c globus_gram_job_manager_setup-4.3.tar.gz
- Previous message: rpms/globus-gram-job-manager/EL-5 .cvsignore, 1.3, 1.4 globus-gram-job-manager.patch, 1.1, 1.2 globus-gram-job-manager.spec, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.3, 1.4
- Next message: File globus_rls_server-4.9.tar.gz uploaded to lookaside cache by ellert
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list