[pdsh/el5] disable torque on el5
Tom Callaway
spot at fedoraproject.org
Fri Sep 7 14:08:01 UTC 2012
commit 849deefbfa05bdaf36bf442b4b5a72941a5a26fa
Author: Tom Callaway <spot at fedoraproject.org>
Date: Fri Sep 7 10:08:39 2012 -0400
disable torque on el5
pdsh.spec | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/pdsh.spec b/pdsh.spec
index 47f6ece..f0f4e78 100644
--- a/pdsh.spec
+++ b/pdsh.spec
@@ -1,6 +1,6 @@
Name: pdsh
Version: 2.26
-Release: 4%{?dist}
+Release: 4%{?dist}.1
Summary: Parallel remote shell program
License: GPLv2+
Url: http://sourceforge.net/projects/pdsh/
@@ -11,6 +11,7 @@ Requires: pdsh-rcmd
# Enabling and disabling pdsh options
# defaults:
# enabled: readline, rsh, ssh, dshgroup, netgroup, debug, nodeupdown, genders
+# only disabled on RHEL 5:
# torque
# disabled: rms, mrsh, qshell, mqshell, xcpu, nodeattr, machines, slurm
#
@@ -35,7 +36,12 @@ Requires: pdsh-rcmd
%{!?_with_debug: %{!?_without_debug: %define _with_debug --with-debug}}
%{!?_with_nodeupdown: %{!?_without_nodeupdown: %define _with_nodeupdown --with-nodeupdown}}
%{!?_with_genders: %{!?_without_genders: %define _with_genders --with-genders}}
+# This is only DISABLED on RHEL 5
+%if 0%{?rhel} < 6
+%{!?_with_torque: %{!?_without_torque: %define _without_torque --without-torque}}
+%else
%{!?_with_torque: %{!?_without_torque: %define _with_torque --with-torque}}
+%endif
# These are default DISABLED.
%{!?_with_rms: %{!?_without_rms: %define _without_rms --without-rms}}
%{!?_with_mrsh: %{!?_without_mrsh: %define _without_mrsh --without-mrsh}}
@@ -404,6 +410,9 @@ fi
%endif
%changelog
+* Fri Sep 7 2012 Tom Callaway <spot at fedoraproject.org> - 2.26-4.1
+- el5 only: disable torque (not in epel)
+
* Mon Jul 23 2012 Tom Callaway <spot at fedoraproject.org> - 2.26-4
- enable mod-genders by default (bz810019)
- enable mod-torque by default
More information about the scm-commits
mailing list