[globus-gram-job-manager] Update to Globus Toolkit 5.0.4 Fix doxygen markup
Mattias Ellert
ellert at fedoraproject.org
Tue Jun 7 15:06:49 UTC 2011
commit 9e014d1454b8e3d27b2cc0858e877fbbba965bea
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Mon Jun 6 17:22:55 2011 +0200
Update to Globus Toolkit 5.0.4
Fix doxygen markup
.gitignore | 2 +-
globus-gram-job-manager-doxygen.patch | 36 +++++++++++++++++++++++++++++++++
globus-gram-job-manager.spec | 30 +++++++++++++++++----------
sources | 4 +-
4 files changed, 58 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a1f1a92..03fb5a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/globus_gram_job_manager-10.67.tar.gz
+/globus_gram_job_manager-10.70.tar.gz
/globus_gram_job_manager_setup-4.3.tar.gz
diff --git a/globus-gram-job-manager-doxygen.patch b/globus-gram-job-manager-doxygen.patch
new file mode 100644
index 0000000..bbb0372
--- /dev/null
+++ b/globus-gram-job-manager-doxygen.patch
@@ -0,0 +1,36 @@
+diff -ur globus_gram_job_manager-10.70.orig/globus_gram_job_manager.c globus_gram_job_manager-10.70/globus_gram_job_manager.c
+--- globus_gram_job_manager-10.70.orig/globus_gram_job_manager.c 2011-01-26 20:54:57.000000000 +0100
++++ globus_gram_job_manager-10.70/globus_gram_job_manager.c 2011-06-05 11:18:15.276896087 +0200
+@@ -2067,7 +2067,7 @@
+ /**
+ * Scan the job state directory for jobs to restart
+ *
+- * The @a globus_gram_job_manager_request_load_all() function scans the
++ * The globus_gram_job_manager_request_load_all() function scans the
+ * job state directory named in the job manager configuration and then
+ * attempts to reload each job found in that directory. If the job is in
+ * a state where it will be immediately swapped out (waiting for SEG events)
+diff -ur globus_gram_job_manager-10.70.orig/globus_gram_job_manager_gsi.c globus_gram_job_manager-10.70/globus_gram_job_manager_gsi.c
+--- globus_gram_job_manager-10.70.orig/globus_gram_job_manager_gsi.c 2010-05-19 18:23:20.000000000 +0200
++++ globus_gram_job_manager-10.70/globus_gram_job_manager_gsi.c 2011-06-05 11:27:45.566291808 +0200
+@@ -1006,7 +1006,7 @@
+ * @ingroup globus_gram_gsi
+ *
+ * @details
+- * The @a globus_gram_gsi_get_dn_hash() function inspects the credential
++ * The globus_gram_gsi_get_dn_hash() function inspects the credential
+ * named by @a cred parameter to determine the identity of the credential.
+ * It then computes the default hash on that name and assigns a copy of
+ * that value to the @a hash parameter. The caller is responsible for freeing
+@@ -1018,9 +1018,9 @@
+ * Pointer to be set to the hash of the identity of @a cred.
+ *
+ * @return
+- * On success, @a globus_gram_gsi_get_dn_hash() returns GLOBUS_SUCCESS
++ * On success, globus_gram_gsi_get_dn_hash() returns GLOBUS_SUCCESS
+ * and modifies the @a hash parameter to point to a copy of the string
+- * representation of the hash. If an error occurs, @a
++ * representation of the hash. If an error occurs,
+ * globus_gram_gsi_get_dn_hash() returns a non-zero error code and the
+ * the value of @a hash is undefined.
+ */
diff --git a/globus-gram-job-manager.spec b/globus-gram-job-manager.spec
index c11de64..3eaead2 100644
--- a/globus-gram-job-manager.spec
+++ b/globus-gram-job-manager.spec
@@ -6,26 +6,26 @@
Name: globus-gram-job-manager
%global _name %(tr - _ <<< %{name})
-Version: 10.67
+Version: 10.70
%global setupversion 4.3
-Release: 3%{?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.3/installers/src/gt5.0.3-all-source-installer.tar.bz2
-# tar -jxf gt5.0.3-all-source-installer.tar.bz2
-# mv gt5.0.3-all-source-installer/source-trees/gram/jobmanager/source globus_gram_job_manager-10.67
-# cp -p gt5.0.3-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager-10.67
-# tar -zcf globus_gram_job_manager-10.67.tar.gz globus_gram_job_manager-10.67
+# wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.4/installers/src/gt5.0.4-all-source-installer.tar.bz2
+# tar -jxf gt5.0.4-all-source-installer.tar.bz2
+# mv gt5.0.4-all-source-installer/source-trees/gram/jobmanager/source globus_gram_job_manager-10.70
+# cp -p gt5.0.4-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager-10.70
+# tar -zcf globus_gram_job_manager-10.70.tar.gz globus_gram_job_manager-10.70
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.3/installers/src/gt5.0.3-all-source-installer.tar.bz2
-# tar -jxf gt5.0.3-all-source-installer.tar.bz2
-# mv gt5.0.3-all-source-installer/source-trees/gram/jobmanager/setup/program globus_gram_job_manager_setup-4.3
-# cp -p gt5.0.3-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.4/installers/src/gt5.0.4-all-source-installer.tar.bz2
+# tar -jxf gt5.0.4-all-source-installer.tar.bz2
+# mv gt5.0.4-all-source-installer/source-trees/gram/jobmanager/setup/program globus_gram_job_manager_setup-4.3
+# cp -p gt5.0.4-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
# README file
@@ -42,6 +42,9 @@ Patch2: %{name}-undefined.patch
# Using PATH_MAX is not portable:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6997
Patch3: %{name}-pathmax.patch
+# Fix doxygen markup
+# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7185
+Patch4: %{name}-doxygen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: %{name}-setup = %{setupversion}
@@ -122,6 +125,7 @@ cd %{_name}_setup-%{setupversion}
cd -
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
# Remove files that should be replaced during bootstrap
@@ -263,6 +267,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-setup-%{setupversion}/html
%changelog
+* Sun Jun 05 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.70-1
+- Update to Globus Toolkit 5.0.4
+- Fix doxygen markup
+
* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.67-3
- Add README file
diff --git a/sources b/sources
index 6034bce..5552533 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d9b975554a2102a0f9c88d233c534e34 globus_gram_job_manager-10.67.tar.gz
-b3c915193f5136221cf5a857f2a4855e globus_gram_job_manager_setup-4.3.tar.gz
+ac4403a088c582a9c3ad1fe70c2e4160 globus_gram_job_manager-10.70.tar.gz
+58c268b1ac66a934a18d0657581b7485 globus_gram_job_manager_setup-4.3.tar.gz
More information about the scm-commits
mailing list