From e8c42a64f43c457cef7752df4231683a42d38a91 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Tue, 10 Aug 2010 20:30:03 +0200 Subject: [PATCH 01/15] Upsteam to 2.5.1 --- .gitignore | 1 + sources | 2 +- torque.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 273924f..7b9e28e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ torque-2.4.8.tar.gz +torque-2.5.1.tar.gz diff --git a/sources b/sources index c202166..f5495ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -56170b7fce63fed9ed0cc83ee5bd3e3a torque-2.4.8.tar.gz +65024d3ea5090bd15fefca67d5db6278 torque-2.5.1.tar.gz diff --git a/torque.spec b/torque.spec index e29beae..1d9304b 100644 --- a/torque.spec +++ b/torque.spec @@ -67,8 +67,8 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 2.4.8 -Release: 3%{?dist} +Version: 2.5.1 +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -642,6 +642,9 @@ fi %changelog +* Tue Aug 10 2010 Steve Traylen - 2.5.1-1 +- New upstream 2.5.1 + * Wed Jul 14 2010 Steve Traylen - 2.4.8-3 - Rebuild for cvs mistake. From ed14f85a25276c46f303e3b822da5b15fd53aa0b Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Tue, 7 Sep 2010 10:35:46 +0200 Subject: [PATCH 02/15] Version 2.5.2. --- .gitignore | 3 +-- sources | 2 +- torque.spec | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7b9e28e..118843b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -torque-2.4.8.tar.gz -torque-2.5.1.tar.gz +/torque-2.5.2.tar.gz diff --git a/sources b/sources index f5495ab..55cdca7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -65024d3ea5090bd15fefca67d5db6278 torque-2.5.1.tar.gz +7d4a541b5ad16a8c0dcebafe0930dc1f torque-2.5.2.tar.gz diff --git a/torque.spec b/torque.spec index 1d9304b..2f9cd2d 100644 --- a/torque.spec +++ b/torque.spec @@ -67,7 +67,7 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 2.5.1 +Version: 2.5.2 Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz @@ -642,6 +642,9 @@ fi %changelog +* Tue Sep 7 2010 Steve Traylen - 2.5.2-1 +- New upstream 2.5.2 + * Tue Aug 10 2010 Steve Traylen - 2.5.1-1 - New upstream 2.5.1 From 5348140f1489309b6072ab877b8343462f978c4e Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Tue, 7 Sep 2010 11:02:52 +0200 Subject: [PATCH 03/15] 3 new man pages. --- torque.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/torque.spec b/torque.spec index 2f9cd2d..cd2ec92 100644 --- a/torque.spec +++ b/torque.spec @@ -531,6 +531,9 @@ fi %{_mandir}/man3/pbs_terminate.3.* %{_mandir}/man3/rpp.3.* %{_mandir}/man3/tm.3.* +%{_mandir}/man3/pbs_checkpointjob.3.gz +%{_mandir}/man3/pbs_fbserver.3.gz +%{_mandir}/man3/pbs_get_server_list.3.gz %{_mandir}/man7/pbs_job_attributes.7.* %{_mandir}/man7/pbs_queue_attributes.7.* %{_mandir}/man7/pbs_resources.7.* @@ -644,6 +647,7 @@ fi %changelog * Tue Sep 7 2010 Steve Traylen - 2.5.2-1 - New upstream 2.5.2 +- Three new man pages added to file listing. * Tue Aug 10 2010 Steve Traylen - 2.5.1-1 - New upstream 2.5.1 From b211bba7ab12771a4c5aedccf96985fbc8af9194 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 14 Oct 2010 20:55:49 +0200 Subject: [PATCH 04/15] Not needed. --- torque-2.1.10-NI_MAXSERV.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 torque-2.1.10-NI_MAXSERV.patch diff --git a/torque-2.1.10-NI_MAXSERV.patch b/torque-2.1.10-NI_MAXSERV.patch deleted file mode 100644 index a6df41f..0000000 --- a/torque-2.1.10-NI_MAXSERV.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -pruN torque-2.1.10_orig/src/include/port_forwarding.h torque-2.1.10/src/include/port_forwarding.h ---- torque-2.1.10_orig/src/include/port_forwarding.h 2006-10-13 11:25:37.000000000 -0700 -+++ torque-2.1.10/src/include/port_forwarding.h 2008-02-14 13:08:05.000000000 -0800 -@@ -16,6 +16,10 @@ - # endif - #endif /* X_UNIX_PATH */ - -+#ifndef NI_MAXSERV -+# define NI_MAXSERV 32 -+#endif /* !NI_MAXSERV */ -+ - - struct pfwdsock { - int sock; From 36a82535ca3879cb0d45a66215d27e11c807cd57 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 14 Oct 2010 21:59:29 +0200 Subject: [PATCH 05/15] rhbz#528060 --- torque-cond-touch.patch | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 torque-cond-touch.patch diff --git a/torque-cond-touch.patch b/torque-cond-touch.patch new file mode 100644 index 0000000..9fb0834 --- /dev/null +++ b/torque-cond-touch.patch @@ -0,0 +1,45 @@ +diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_mom torque-2.5.2/contrib/init.d/pbs_mom +--- torque-2.5.2.ORIG/contrib/init.d/pbs_mom 2010-10-14 21:47:05.035383236 +0200 ++++ torque-2.5.2/contrib/init.d/pbs_mom 2010-10-14 21:49:38.433427973 +0200 +@@ -54,7 +54,7 @@ + # ulimit -c unlimited # Uncomment this to preserve core files + daemon $PBS_DAEMON $args -d $PBS_HOME + RET=$? +- touch /var/lock/subsys/pbs_mom ++ [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_mom + echo + ;; + purge) +@@ -62,7 +62,7 @@ + echo -n "Starting TORQUE Mom with purge: " + daemon $PBS_DAEMON -r + RET=$? +- touch /var/lock/subsys/pbs_mom ++ [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_mom + echo + ;; + stop) +diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_sched torque-2.5.2/contrib/init.d/pbs_sched +--- torque-2.5.2.ORIG/contrib/init.d/pbs_sched 2010-10-14 21:47:05.034384022 +0200 ++++ torque-2.5.2/contrib/init.d/pbs_sched 2010-10-14 21:50:32.826542794 +0200 +@@ -22,7 +22,7 @@ + echo -n "Starting TORQUE Scheduler: " + daemon $PBS_DAEMON -d $PBS_HOME + RET=$? +- touch /var/lock/subsys/pbs_sched ++ [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_sched + echo + ;; + stop) +diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_server torque-2.5.2/contrib/init.d/pbs_server +--- torque-2.5.2.ORIG/contrib/init.d/pbs_server 2010-10-14 21:47:05.034384022 +0200 ++++ torque-2.5.2/contrib/init.d/pbs_server 2010-10-14 21:50:09.310577353 +0200 +@@ -28,7 +28,7 @@ + daemon $PBS_DAEMON -t create -d $PBS_HOME + fi + RET=$? +- touch /var/lock/subsys/pbs_server ++ [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_server + echo + ;; + stop) From ce18607da43d5147f6ec6b6f0d13a39bdcb9d9f7 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 14 Oct 2010 22:06:14 +0200 Subject: [PATCH 06/15] rhbz#528060 --- torque.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index cd2ec92..53c30ac 100644 --- a/torque.spec +++ b/torque.spec @@ -68,7 +68,7 @@ Name: torque Version: 2.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -78,6 +78,8 @@ Source5: xpbsmon.png Source6: README.Fedora Source7: pbs-config-multilib Source8: config +# https://bugzilla.redhat.com/show_bug.cgi?id=528060 +Patch0: torque-cond-touch.patch License: OpenPBS Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -264,6 +266,7 @@ This package holds the server. %prep %setup -q +%patch0 -p1 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE7} %{SOURCE8} . # rm x bit on some documentation. @@ -645,6 +648,10 @@ fi %changelog +* Thu Oct 14 2010 Steve Traylen - 2.5.2-2 +- rhbz#58060, add torque-cond-touch.spec to only touch files + when service actually starts. + * Tue Sep 7 2010 Steve Traylen - 2.5.2-1 - New upstream 2.5.2 - Three new man pages added to file listing. From 42a804b6959caae1c20a2ae726a5f52079675f6e Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 14 Oct 2010 23:02:55 +0200 Subject: [PATCH 07/15] - rhbz#631256 Only create db if asked to. --- torque-create-request.patch | 42 +++++++++++++++++++++++++++++++++++++ torque.spec | 8 ++++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 torque-create-request.patch diff --git a/torque-create-request.patch b/torque-create-request.patch new file mode 100644 index 0000000..86a9851 --- /dev/null +++ b/torque-create-request.patch @@ -0,0 +1,42 @@ +diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_server torque-2.5.2/contrib/init.d/pbs_server +--- torque-2.5.2.ORIG/contrib/init.d/pbs_server 2010-10-14 22:16:32.978386147 +0200 ++++ torque-2.5.2/contrib/init.d/pbs_server 2010-10-14 23:01:59.911917744 +0200 +@@ -25,11 +25,29 @@ + then + daemon $PBS_DAEMON -d $PBS_HOME + else ++ echo -n "use \"service pbs_server create\"" && failure && echo && exit 5 ++ fi ++ RET=$? ++ [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_server ++ echo ++ ;; ++ create) ++ echo -n "Creating Torque Server Database:... " ++ if [ -r $PBS_HOME/server_priv/serverdb ] ++ then ++ echo -n "serverdb file allready exists?" && failure && echo && exit 5 ++ else + daemon $PBS_DAEMON -t create -d $PBS_HOME + fi + RET=$? + [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_server + echo ++ sleep 3 ++ echo -n "Shutting down TORQUE Server: " ++ killproc pbs_server ++ RET=$? ++ rm -f /var/lock/subsys/pbs_server ++ echo + ;; + stop) + echo -n "Shutting down TORQUE Server: " +@@ -53,7 +71,7 @@ + echo + ;; + *) +- echo "Usage: pbs_server {start|stop|restart|status|reload}" ++ echo "Usage: pbs_server {start|stop|restart|status|reload|create}" + exit 1 + esac + exit $RET diff --git a/torque.spec b/torque.spec index 53c30ac..a25f302 100644 --- a/torque.spec +++ b/torque.spec @@ -68,7 +68,7 @@ Name: torque Version: 2.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -80,6 +80,8 @@ Source7: pbs-config-multilib Source8: config # https://bugzilla.redhat.com/show_bug.cgi?id=528060 Patch0: torque-cond-touch.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=631256 +Patch1: torque-create-request.patch License: OpenPBS Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -267,6 +269,7 @@ This package holds the server. %prep %setup -q %patch0 -p1 +%patch1 -p1 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE7} %{SOURCE8} . # rm x bit on some documentation. @@ -648,6 +651,9 @@ fi %changelog +* Thu Oct 14 2010 Steve Traylen - 2.5.2-3 +- rhbz#631256 Only create db if asked to. + * Thu Oct 14 2010 Steve Traylen - 2.5.2-2 - rhbz#58060, add torque-cond-touch.spec to only touch files when service actually starts. From 60b7bb5897f0caf5729ded1ba56b8a4424cc8719 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 14 Oct 2010 23:47:23 +0200 Subject: [PATCH 08/15] - rhbz#643194, stop a stoped service, start a start service return codes now fixed. --- torque-start-start.patch | 71 ++++++++++++++++++++++++++++++++++++++++ torque.spec | 9 ++++- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 torque-start-start.patch diff --git a/torque-start-start.patch b/torque-start-start.patch new file mode 100644 index 0000000..66a9841 --- /dev/null +++ b/torque-start-start.patch @@ -0,0 +1,71 @@ +diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_mom torque-2.5.2/contrib/init.d/pbs_mom +--- torque-2.5.2.ORIG/contrib/init.d/pbs_mom 2010-10-14 23:20:58.500633494 +0200 ++++ torque-2.5.2/contrib/init.d/pbs_mom 2010-10-14 23:36:00.369403267 +0200 +@@ -51,6 +51,9 @@ + case "$1" in + start) + echo -n "Starting TORQUE Mom: " ++ status pbs_mom 2>&1 > /dev/null ++ RET=$? ++ [ $RET -eq 0 ] && echo -n "pbs_mom already running" && success && echo && exit 0 + # ulimit -c unlimited # Uncomment this to preserve core files + daemon $PBS_DAEMON $args -d $PBS_HOME + RET=$? +@@ -67,6 +70,9 @@ + ;; + stop) + echo -n "Shutting down TORQUE Mom: " ++ status pbs_mom 2>&1 > /dev/null ++ RET=$? ++ [ ! $RET -eq 0 ] && echo -n "pbs_mom already stopped" && success && echo && exit 0 + kill_pbs_mom + RET=$? + [ $RET -eq 0 ] && success "shutdown" || failure "shutdown" +diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_sched torque-2.5.2/contrib/init.d/pbs_sched +--- torque-2.5.2.ORIG/contrib/init.d/pbs_sched 2010-10-14 23:20:58.500633494 +0200 ++++ torque-2.5.2/contrib/init.d/pbs_sched 2010-10-14 23:38:04.275381652 +0200 +@@ -20,6 +20,10 @@ + case "$1" in + start) + echo -n "Starting TORQUE Scheduler: " ++ status pbs_sched 2>&1 > /dev/null ++ RET=$? ++ [ $RET -eq 0 ] && echo -n "pbs_sched already running" && success && echo && exit 0 ++ + daemon $PBS_DAEMON -d $PBS_HOME + RET=$? + [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_sched +@@ -27,6 +31,9 @@ + ;; + stop) + echo -n "Shutting down TORQUE Scheduler: " ++ status pbs_sched 2>&1 > /dev/null ++ RET=$? ++ [ ! $RET -eq 0 ] && echo -n "pbs_sched already stopped" && success && echo && exit 0 + killproc pbs_sched + RET=$? + rm -f /var/lock/subsys/pbs_sched +diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_server torque-2.5.2/contrib/init.d/pbs_server +--- torque-2.5.2.ORIG/contrib/init.d/pbs_server 2010-10-14 23:20:58.499634001 +0200 ++++ torque-2.5.2/contrib/init.d/pbs_server 2010-10-14 23:37:06.460197422 +0200 +@@ -20,6 +20,10 @@ + case "$1" in + start) + echo -n "Starting TORQUE Server: " ++ status pbs_server 2>&1 > /dev/null ++ RET=$? ++ [ $RET -eq 0 ] && echo -n "pbs_server already running" && success && echo && exit 0 ++ + # ulimit -c unlimited # Uncomment this to preserve core files + if [ -r $PBS_HOME/server_priv/serverdb ] + then +@@ -51,6 +55,9 @@ + ;; + stop) + echo -n "Shutting down TORQUE Server: " ++ status pbs_server 2>&1 > /dev/null ++ RET=$? ++ [ ! $RET -eq 0 ] && echo -n "pbs_server already stopped" && success && echo && exit 0 + killproc pbs_server + RET=$? + rm -f /var/lock/subsys/pbs_server diff --git a/torque.spec b/torque.spec index a25f302..31a0396 100644 --- a/torque.spec +++ b/torque.spec @@ -68,7 +68,7 @@ Name: torque Version: 2.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -82,6 +82,8 @@ Source8: config Patch0: torque-cond-touch.patch # https://bugzilla.redhat.com/show_bug.cgi?id=631256 Patch1: torque-create-request.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=643194 +Patch2: torque-start-start.patch License: OpenPBS Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -270,6 +272,7 @@ This package holds the server. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE7} %{SOURCE8} . # rm x bit on some documentation. @@ -651,6 +654,10 @@ fi %changelog +* Thu Oct 14 2010 Steve Traylen - 2.5.2-4 +- rhbz#643194, stop a stoped service, start a start service + return codes now fixed. + * Thu Oct 14 2010 Steve Traylen - 2.5.2-3 - rhbz#631256 Only create db if asked to. From b3e030203590ae79aa731e82a04ff903bd614794 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 18 Nov 2010 21:23:21 +0100 Subject: [PATCH 09/15] - Upstream to 2.5.3. --- .gitignore | 1 + sources | 2 +- torque.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 118843b..808b65c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /torque-2.5.2.tar.gz +/torque-2.5.3.tar.gz diff --git a/sources b/sources index 55cdca7..4175e51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d4a541b5ad16a8c0dcebafe0930dc1f torque-2.5.2.tar.gz +b7868cf95582e20f2725651f97266947 torque-2.5.3.tar.gz diff --git a/torque.spec b/torque.spec index 31a0396..c7138ea 100644 --- a/torque.spec +++ b/torque.spec @@ -67,8 +67,8 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 2.5.2 -Release: 4%{?dist} +Version: 2.5.3 +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -654,6 +654,9 @@ fi %changelog +* Thu Nov 18 2010 Steve Traylen - 2.5.3-1 +- Upstream to 2.5.3. + * Thu Oct 14 2010 Steve Traylen - 2.5.2-4 - rhbz#643194, stop a stoped service, start a start service return codes now fixed. From 65af9ebffff1ea0e66285c6090e3a34b1f4f835d Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 8 Dec 2010 12:45:08 +0100 Subject: [PATCH 10/15] - Only build noarch doc package on RHEL6 or Fedora10. #659723 --- torque.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index c7138ea..8479e34 100644 --- a/torque.spec +++ b/torque.spec @@ -68,7 +68,7 @@ Name: torque Version: 2.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -130,7 +130,9 @@ This package holds the command-line client programs. Group: Documentation Summary: Documentation files for TORQUE Requires: %{name} = %{version}-%{release} +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch +%endif %description docs TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource @@ -654,6 +656,9 @@ fi %changelog +* Wed Dec 8 2010 Steve Traylen - 2.5.3-2 +- Only build noarch doc package on RHEL6 or Fedora10. #659723 + * Thu Nov 18 2010 Steve Traylen - 2.5.3-1 - Upstream to 2.5.3. From aaa5a2233d84c0de9503d317dd4179f6a7102de0 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 9 Dec 2010 21:43:38 +0100 Subject: [PATCH 11/15] - Enable drmaa support and add drmaa sub packages. --- torque.spec | 132 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 126 insertions(+), 6 deletions(-) diff --git a/torque.spec b/torque.spec index 8479e34..4360bd9 100644 --- a/torque.spec +++ b/torque.spec @@ -68,7 +68,7 @@ Name: torque Version: 2.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -87,6 +87,9 @@ Patch2: torque-start-start.patch License: OpenPBS Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ +%if 0%{?el4}%{?el5} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%endif BuildRequires: desktop-file-utils BuildRequires: pam-devel BuildRequires: xauth @@ -99,6 +102,30 @@ BuildRequires: tcl-devel BuildRequires: tk-devel %endif +#doxygen appears to be broken in rawhide at the moment +#Dec 9th 2010 so don't build the drmaa documentation +#for now. +%if ! 0%{?fc15} +%global doxydoc 1 +%endif + +%if 0%{?doxydoc} +BuildRequires: graphviz +BuildRequires: doxygen +%if "%{?rhel}" == "5" +BuildRequires: graphviz-gd +%endif +%if %{?fedora}%{!?fedora:0} >= 9 +BuildRequires: tex(latex) +%else +%if %{?rhel}%{!?rhel:0} >= 6 +BuildRequires: tex(latex) +%else +BuildRequires: tetex-latex +%endif +%endif +%endif + %description TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource manager providing control over batch jobs and distributed compute nodes. @@ -270,6 +297,41 @@ other leading edge HPC organizations. This package holds the server. +%package drmaa +Group: System Environment/Daemons +Summary: Runtime files for the drmaa interface. +Requires: torque-libs = %{version}-%{release} + +%description drmaa +TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource +manager providing control over batch jobs and distributed compute nodes. +TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability, +fault tolerance, and feature extension patches provided by USC, NCSA, OSC, +the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many +other leading edge HPC organizations. + +Runtime files for working the DRMAA interface to torque. +DRMAA is "Distributed Resource Management Application API" + + +%package drmaa-devel +Group: System Environment/Daemons +Summary: Development files for the drmaa interface. +Requires: torque-drmaa = %{version}-%{release} +Requires: torque-devel = %{version}-%{release} + +%description drmaa-devel +TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource +manager providing control over batch jobs and distributed compute nodes. +TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability, +fault tolerance, and feature extension patches provided by USC, NCSA, OSC, +the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many +other leading edge HPC organizations. + +Developement files for working the DRMAA interface to torque. +DRMAA is "Distributed Resource Management Application API" + + %prep %setup -q %patch0 -p1 @@ -285,6 +347,7 @@ CFLAGS="%{optflags} -Wno-overlength-strings" %configure --includedir=%{_includedir}/torque \ --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \ --with-sendmail=%{_sbindir}/sendmail --disable-static \ + --enable-drmaa \ %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags} @@ -378,6 +441,17 @@ ln -s %{_var}/log/torque/server_logs . popd +# Move drmaa man pages to correct place +# and delete the three copies of the same documentation. + +%if 0%{?doxydoc} +mv %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/* %{buildroot}%{_mandir}/man3/. +rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/html/* +rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/latex/* +# Include drmaa.pdf later from the src tree. +rm %{buildroot}%{_defaultdocdir}/torque-drmaa/drmaa.pdf +%endif + %clean rm -rf %{buildroot} @@ -426,8 +500,11 @@ if [ $1 -eq 0 ]; then /usr/sbin/alternatives --remove qsub %{_bindir}/qsub-torque fi -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig +%post drmaa -p /sbin/ldconfig +%postun drmaa -p /sbin/ldconfig + %post mom /sbin/chkconfig --add pbs_mom @@ -500,6 +577,7 @@ fi %files docs %defattr(-, root, root, -) %doc doc/admin_guide.ps +%doc src/drmaa/drmaa.pdf %{_mandir}/man1/basl2c.1.* %{_mandir}/man1/nqs2pbs.1.* %{_mandir}/man1/pbs.1.* @@ -597,12 +675,19 @@ fi %files libs %defattr(-, root, root, -) -%{_libdir}/*.so.* +%{_libdir}/libtorque.so.* %files devel %defattr(-, root, root, -) -%{_libdir}/*.so -%{_includedir}/torque +%{_libdir}/libtorque.so +%{_includedir}/torque/pbs_error.h +%{_includedir}/torque/pbs_error_db.h +%{_includedir}/torque/pbs_ifl.h +%{_includedir}/torque/rm.h +%{_includedir}/torque/rpp.h +%{_includedir}/torque/tm.h +%{_includedir}/torque/tm_.h + %{_bindir}/pbs-config %files mom @@ -654,8 +739,43 @@ fi %{torquehomedir}/server_logs %{torquehomedir}/server_priv +%files drmaa +%defattr(-, root, root, -) +%{_libdir}/libdrmaa.so.* + +%files drmaa-devel +%defattr(-, root, root, -) +%{_libdir}/libdrmaa.so +%{_includedir}/torque/drmaa.h +%if 0%{?doxydoc} +%{_mandir}/man3/compat.h.3.* +%{_mandir}/man3/drmaa.3.* +%{_mandir}/man3/drmaa.h.3.* +%{_mandir}/man3/drmaa_attr_names_s.3.* +%{_mandir}/man3/drmaa_attr_values_s.3.* +%{_mandir}/man3/drmaa_attrib.3.* +%{_mandir}/man3/drmaa_attrib_info_s.3.* +%{_mandir}/man3/drmaa_def_attr_s.3.* +%{_mandir}/man3/drmaa_job_ids_s.3.* +%{_mandir}/man3/drmaa_job_iter_s.3.* +%{_mandir}/man3/drmaa_job_s.3.* +%{_mandir}/man3/drmaa_job_template_s.3.* +%{_mandir}/man3/drmaa_jobt.3.* +%{_mandir}/man3/drmaa_session.3.* +%{_mandir}/man3/drmaa_session_s.3.* +%{_mandir}/man3/drmaa_submission_context_s.3.* +%{_mandir}/man3/drmaa_viter.3.* +%{_mandir}/man3/error.h.3.* +%{_mandir}/man3/jobs.3.* +%{_mandir}/man3/jobs.h.3.* +%{_mandir}/man3/lookup3.h.3.* +%{_mandir}/man3/pbs_attrib.3.* +%endif %changelog +* Wed Dec 8 2010 Steve Traylen - 2.5.3-3 +- Enable drmaa support and add drmaa sub packages. + * Wed Dec 8 2010 Steve Traylen - 2.5.3-2 - Only build noarch doc package on RHEL6 or Fedora10. #659723 From 673d84fb61c20f0bb465a87b19ad5ac88f77083e Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 9 Dec 2010 22:33:53 +0100 Subject: [PATCH 12/15] - Enable drmaa support and add drmaa sub packages. --- torque.spec | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/torque.spec b/torque.spec index 4360bd9..7e79c9f 100644 --- a/torque.spec +++ b/torque.spec @@ -299,7 +299,7 @@ This package holds the server. %package drmaa Group: System Environment/Daemons -Summary: Runtime files for the drmaa interface. +Summary: Run time files for the drmaa interface Requires: torque-libs = %{version}-%{release} %description drmaa @@ -310,7 +310,7 @@ fault tolerance, and feature extension patches provided by USC, NCSA, OSC, the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many other leading edge HPC organizations. -Runtime files for working the DRMAA interface to torque. +Run time files for working the DRMAA interface to torque. DRMAA is "Distributed Resource Management Application API" @@ -646,20 +646,23 @@ fi %{_mandir}/man7/pbs_resources_unicos8.7.* %{_mandir}/man7/pbs_resources_unicosmk2.7.* %{_mandir}/man7/pbs_server_attributes.7.* -%{_mandir}/man8/pbs_mom.8.* -%{_mandir}/man8/pbs_sched.8.* -%{_mandir}/man8/pbs_sched_basl.8.* -%{_mandir}/man8/pbs_sched_cc.8.* -%{_mandir}/man8/pbs_sched_tcl.8.* -%{_mandir}/man8/pbs_server.8.* -%{_mandir}/man8/pbsnodes.8.* -%{_mandir}/man8/qdisable.8.* -%{_mandir}/man8/qenable.8.* -%{_mandir}/man8/qrun.8.* -%{_mandir}/man8/qstart.8.* -%{_mandir}/man8/qstop.8.* -%{_mandir}/man8/qterm.8.* +# And the following are alternative managed ones. +%{_mandir}/man1/qsub-torque.1.* +%{_mandir}/man1/qalter-torque.1.* +%{_mandir}/man1/qdel-torque.1.* +%{_mandir}/man1/qhold-torque.1.* +%{_mandir}/man1/qrls-torque.1.* +%{_mandir}/man1/qselect-torque.1.* +%{_mandir}/man1/qstat-torque.1.* + + +%files docs +%defattr(-, root, root, -) +%doc doc/admin_guide.ps +%if 0%{?doxydoc} +%doc src/drmaa/drmaa.pdf +%endif %if %{build_gui} %files gui From 27b007d689e5b548c450b1fcae5be6b70a3d5ee6 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 9 Dec 2010 22:35:58 +0100 Subject: [PATCH 13/15] - Move man pages from doc subpackage to relavent sub package. --- torque.spec | 104 ++++++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 51 deletions(-) diff --git a/torque.spec b/torque.spec index 7e79c9f..c985533 100644 --- a/torque.spec +++ b/torque.spec @@ -452,6 +452,9 @@ rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/latex/* rm %{buildroot}%{_defaultdocdir}/torque-drmaa/drmaa.pdf %endif +#Remove man page for binary that is not included. +rm %{buildroot}%{_mandir}/man1/basl2c.1 + %clean rm -rf %{buildroot} @@ -545,7 +548,7 @@ fi %{torquehomedir}/server_name %config(noreplace) %{_sysconfdir}/torque/pbs_environment %config(noreplace) %{_sysconfdir}/torque/server_name - +%{_mandir}/man1/pbs.1.* %files client %defattr(-, root, root, -) @@ -565,22 +568,7 @@ fi %if %{use_tcl} %{_bindir}/pbs_tclsh %endif -%{_mandir}/man1/qsub-torque.1.* -%{_mandir}/man1/qalter-torque.1.* -%{_mandir}/man1/qdel-torque.1.* -%{_mandir}/man1/qhold-torque.1.* -%{_mandir}/man1/qrls-torque.1.* -%{_mandir}/man1/qselect-torque.1.* -%{_mandir}/man1/qstat-torque.1.* - - -%files docs -%defattr(-, root, root, -) -%doc doc/admin_guide.ps -%doc src/drmaa/drmaa.pdf -%{_mandir}/man1/basl2c.1.* %{_mandir}/man1/nqs2pbs.1.* -%{_mandir}/man1/pbs.1.* %{_mandir}/man1/pbsdsh.1.* %{_mandir}/man1/qchkpt.1.* %{_mandir}/man1/qmgr.1.* @@ -589,40 +577,13 @@ fi %{_mandir}/man1/qorder.1.* %{_mandir}/man1/qrerun.1.* %{_mandir}/man1/qsig.1.* -%{_mandir}/man1/xpbs.1.* -%{_mandir}/man1/xpbsmon.1.* -%{_mandir}/man3/pbs_alterjob.3.* -%{_mandir}/man3/pbs_connect.3.* -%{_mandir}/man3/pbs_default.3.* -%{_mandir}/man3/pbs_deljob.3.* -%{_mandir}/man3/pbs_disconnect.3.* -%{_mandir}/man3/pbs_geterrmsg.3.* -%{_mandir}/man3/pbs_holdjob.3.* -%{_mandir}/man3/pbs_locate.3.* -%{_mandir}/man3/pbs_manager.3.* -%{_mandir}/man3/pbs_movejob.3.* -%{_mandir}/man3/pbs_msgjob.3.* -%{_mandir}/man3/pbs_orderjob.3.* -%{_mandir}/man3/pbs_rerunjob.3.* -%{_mandir}/man3/pbs_rescquery.3.* -%{_mandir}/man3/pbs_rescreserve.3.* -%{_mandir}/man3/pbs_rlsjob.3.* -%{_mandir}/man3/pbs_runjob.3.* -%{_mandir}/man3/pbs_selectjob.3.* -%{_mandir}/man3/pbs_selstat.3.* -%{_mandir}/man3/pbs_sigjob.3.* -%{_mandir}/man3/pbs_stagein.3.* -%{_mandir}/man3/pbs_statjob.3.* -%{_mandir}/man3/pbs_statnode.3.* -%{_mandir}/man3/pbs_statque.3.* -%{_mandir}/man3/pbs_statserver.3.* -%{_mandir}/man3/pbs_submit.3.* -%{_mandir}/man3/pbs_terminate.3.* -%{_mandir}/man3/rpp.3.* -%{_mandir}/man3/tm.3.* -%{_mandir}/man3/pbs_checkpointjob.3.gz -%{_mandir}/man3/pbs_fbserver.3.gz -%{_mandir}/man3/pbs_get_server_list.3.gz +%{_mandir}/man8/pbsnodes.8.* +%{_mandir}/man8/qdisable.8.* +%{_mandir}/man8/qenable.8.* +%{_mandir}/man8/qrun.8.* +%{_mandir}/man8/qstart.8.* +%{_mandir}/man8/qstop.8.* +%{_mandir}/man8/qterm.8.* %{_mandir}/man7/pbs_job_attributes.7.* %{_mandir}/man7/pbs_queue_attributes.7.* %{_mandir}/man7/pbs_resources.7.* @@ -674,6 +635,8 @@ fi %{_libdir}/xpbsmon %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/*.png +%{_mandir}/man1/xpbs.1.* +%{_mandir}/man1/xpbsmon.1.* %endif %files libs @@ -690,8 +653,40 @@ fi %{_includedir}/torque/rpp.h %{_includedir}/torque/tm.h %{_includedir}/torque/tm_.h - %{_bindir}/pbs-config +%{_mandir}/man3/pbs_alterjob.3.* +%{_mandir}/man3/pbs_connect.3.* +%{_mandir}/man3/pbs_default.3.* +%{_mandir}/man3/pbs_deljob.3.* +%{_mandir}/man3/pbs_disconnect.3.* +%{_mandir}/man3/pbs_geterrmsg.3.* +%{_mandir}/man3/pbs_holdjob.3.* +%{_mandir}/man3/pbs_locate.3.* +%{_mandir}/man3/pbs_manager.3.* +%{_mandir}/man3/pbs_movejob.3.* +%{_mandir}/man3/pbs_msgjob.3.* +%{_mandir}/man3/pbs_orderjob.3.* +%{_mandir}/man3/pbs_rerunjob.3.* +%{_mandir}/man3/pbs_rescquery.3.* +%{_mandir}/man3/pbs_rescreserve.3.* +%{_mandir}/man3/pbs_rlsjob.3.* +%{_mandir}/man3/pbs_runjob.3.* +%{_mandir}/man3/pbs_selectjob.3.* +%{_mandir}/man3/pbs_selstat.3.* +%{_mandir}/man3/pbs_sigjob.3.* +%{_mandir}/man3/pbs_stagein.3.* +%{_mandir}/man3/pbs_statjob.3.* +%{_mandir}/man3/pbs_statnode.3.* +%{_mandir}/man3/pbs_statque.3.* +%{_mandir}/man3/pbs_statserver.3.* +%{_mandir}/man3/pbs_submit.3.* +%{_mandir}/man3/pbs_terminate.3.* +%{_mandir}/man3/pbs_checkpointjob.3.gz +%{_mandir}/man3/pbs_fbserver.3.gz +%{_mandir}/man3/pbs_get_server_list.3.gz +%{_mandir}/man3/rpp.3.* +%{_mandir}/man3/tm.3.* + %files mom %defattr(-, root, root, -) @@ -710,6 +705,7 @@ fi %dir %{_var}/log/torque %dir %{_var}/log/torque/mom_logs %dir %{_sysconfdir}/torque/mom +%{_mandir}/man8/pbs_mom.8.* %config(noreplace) %{_sysconfdir}/torque/mom/config %files pam @@ -727,6 +723,10 @@ fi %{torquehomedir}/sched_logs %dir %{_var}/log/torque/sched_logs %dir %{_sysconfdir}/torque/sched +%{_mandir}/man8/pbs_sched.8.* +%{_mandir}/man8/pbs_sched_basl.8.* +%{_mandir}/man8/pbs_sched_cc.8.* +%{_mandir}/man8/pbs_sched_tcl.8.* %config(noreplace) %{_sysconfdir}/torque/sched/dedicated_time %config(noreplace) %{_sysconfdir}/torque/sched/holidays %config(noreplace) %{_sysconfdir}/torque/sched/resource_group @@ -741,6 +741,7 @@ fi %dir %{_var}/log/torque/server_logs %{torquehomedir}/server_logs %{torquehomedir}/server_priv +%{_mandir}/man8/pbs_server.8.* %files drmaa %defattr(-, root, root, -) @@ -777,6 +778,7 @@ fi %changelog * Wed Dec 8 2010 Steve Traylen - 2.5.3-3 +- Move man pages from doc subpackage to relavent sub package. - Enable drmaa support and add drmaa sub packages. * Wed Dec 8 2010 Steve Traylen - 2.5.3-2 From d57d73d65069148418921f6c612c925a58118834 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 9 Dec 2010 22:54:47 +0100 Subject: [PATCH 14/15] - Remove own copy of pbs-config. #657027 --- pbs-config-multilib | 103 -------------------------------------------- torque.spec | 5 +-- 2 files changed, 2 insertions(+), 106 deletions(-) delete mode 100755 pbs-config-multilib diff --git a/pbs-config-multilib b/pbs-config-multilib deleted file mode 100755 index e91a9c1..0000000 --- a/pbs-config-multilib +++ /dev/null @@ -1,103 +0,0 @@ -#! /bin/sh - -package="pbs" -version="2.1.8" - -prefix="/usr" -exec_prefix="/usr" -bindir="/usr/bin" -sbindir="/usr/sbin" -libexecdir="/usr/libexec" -datadir="/usr/share" -sysconfdir="/etc" -sharedstatedir="/usr/com" -localstatedir="/var" -infodir="/usr/share/info" -mandir="/usr/share/man" -includedir="/usr/include/torque" -libs="-ltorque" - -if test "$#" -eq 0; then - cat < - 2.5.3-3 +- Remove own copy of pbs-config. #657027 - Move man pages from doc subpackage to relavent sub package. - Enable drmaa support and add drmaa sub packages. From 1f9abac0bccb4814a4f4ef367a2196f53a9aca0d Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 9 Dec 2010 23:02:00 +0100 Subject: [PATCH 15/15] - Remove own copy of pbs-config. #657027 --- torque.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/torque.spec b/torque.spec index 8a60e10..97deef1 100644 --- a/torque.spec +++ b/torque.spec @@ -368,7 +368,6 @@ rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/*/buildindex rm -f %{buildroot}/%{_lib}/security/pam_pbssimpleauth.{a,la} mkdir -p %{buildroot}%{_bindir} -touch -r pbs-config-multilib %{buildroot}%{_bindir}/pbs-config # install initscripts mkdir -p %{buildroot}%{_initrddir}