[globus-gram-job-manager/el4] Add missing BuildRequires: globus-common-progs and libxml2-devel Portability fixes Fix broken links
Mattias Ellert
ellert at fedoraproject.org
Tue Jan 24 12:54:19 UTC 2012
commit 523f56b3ecf4d65392c62a6783bca41675b591b9
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Tue Jan 24 12:09:00 2012 +0100
Add missing BuildRequires: globus-common-progs and libxml2-devel
Portability fixes
Fix broken links in README file
GLOBUS-GRAM5 | 16 ++++++++--------
globus-gram-job-manager-porting.patch | 15 +++++++++++++++
globus-gram-job-manager.spec | 12 +++++++++++-
3 files changed, 34 insertions(+), 9 deletions(-)
---
diff --git a/GLOBUS-GRAM5 b/GLOBUS-GRAM5
index e6e44fe..e6195b4 100644
--- a/GLOBUS-GRAM5
+++ b/GLOBUS-GRAM5
@@ -1,28 +1,28 @@
This package is part of the GRAM5 component
of the Globus Toolkit. For more information visit:
-http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/
+http://www.globus.org/toolkit/docs/latest-stable/gram5/
Admin Guide:
-http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/admin/
+http://www.globus.org/toolkit/docs/latest-stable/gram5/admin/
User's Guide
-http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/user/
+http://www.globus.org/toolkit/docs/latest-stable/gram5/user/
Developer's Guide:
-http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/developer/
+http://www.globus.org/toolkit/docs/latest-stable/gram5/developer/
Release Notes:
-http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/rn/
+http://www.globus.org/toolkit/docs/latest-stable/gram5/rn/
Public Interface Guide:
-http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/pi/
+http://www.globus.org/toolkit/docs/latest-stable/gram5/pi/
Quality Profile:
-http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/qp/
+http://www.globus.org/toolkit/docs/latest-stable/gram5/qp/
Migrating Guide:
-http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/mig/
+http://www.globus.org/toolkit/docs/latest-stable/gram5/mig/
Globus RPM packaging is supported by the Initiative for Globus in Europe:
http://www.ige-project.eu/
diff --git a/globus-gram-job-manager-porting.patch b/globus-gram-job-manager-porting.patch
new file mode 100644
index 0000000..4ff1aee
--- /dev/null
+++ b/globus-gram-job-manager-porting.patch
@@ -0,0 +1,15 @@
+diff -ur globus_gram_job_manager-13.14.orig/main.c globus_gram_job_manager-13.14/main.c
+--- globus_gram_job_manager-13.14.orig/main.c 2011-11-22 18:55:33.000000000 +0100
++++ globus_gram_job_manager-13.14/main.c 2012-01-18 21:44:52.978999682 +0100
+@@ -553,7 +553,11 @@
+ act.sa_handler = SIG_IGN;
+ sigemptyset(&act.sa_mask);
+ sigaddset(&act.sa_mask, SIGCHLD);
++#ifdef SA_NOCLDWAIT
+ act.sa_flags = SA_NOCLDWAIT;
++#else
++ act.sa_flags = 0;
++#endif
+ sigaction(SIGCHLD, &act, NULL);
+ }
+
diff --git a/globus-gram-job-manager.spec b/globus-gram-job-manager.spec
index 2b4d915..b6c2fd5 100644
--- a/globus-gram-job-manager.spec
+++ b/globus-gram-job-manager.spec
@@ -7,7 +7,7 @@
Name: globus-gram-job-manager
%global _name %(tr - _ <<< %{name})
Version: 13.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Globus Toolkit - GRAM Jobmanager
Group: Applications/Internet
@@ -17,6 +17,7 @@ Source: http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/%{_name}-%{vers
# README file
Source8: GLOBUS-GRAM5
Patch0: %{name}-deps.patch
+Patch1: %{name}-porting.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Keep providing globus-gram-job-manager-setup until not needed
@@ -60,8 +61,11 @@ BuildRequires: globus-usage-devel%{?_isa} >= 3
BuildRequires: globus-rsl-devel%{?_isa} >= 9
BuildRequires: globus-gass-cache-devel%{?_isa} >= 8
BuildRequires: globus-gass-transfer-devel%{?_isa} >= 7
+BuildRequires: globus-common-progs >= 14
BuildRequires: globus-gram-protocol-doc >= 11
BuildRequires: globus-common-doc >= 14
+BuildRequires: openssl-devel
+BuildRequires: libxml2-devel
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -103,6 +107,7 @@ GRAM Jobmanager Documentation Files
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
+%patch1 -p1
%build
# Remove files that should be replaced during bootstrap
@@ -206,6 +211,11 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Wed Jan 18 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 13.14-2
+- Add missing BuildRequires: globus-common-progs and libxml2-devel
+- Portability fixes
+- Fix broken links in README file
+
* Thu Dec 15 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 13.14-1
- Update to Globus Toolkit 5.2.0
- Drop patches globus-gram-job-manager-doxygen.patch,
More information about the scm-commits
mailing list