[pdsh] enable genders, torque support

[Tom Callaway]

commit dd3bad61175d417c16e0636eaf3108d0f92eb316
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Jul 23 10:45:09 2012 -0400

    enable genders, torque support

 pdsh.spec |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)
---
diff --git a/pdsh.spec b/pdsh.spec
index b2233e8..47f6ece 100644
--- a/pdsh.spec
+++ b/pdsh.spec
@@ -1,6 +1,6 @@
 Name: pdsh
 Version: 2.26
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Parallel remote shell program
 License: GPLv2+
 Url: http://sourceforge.net/projects/pdsh/
@@ -10,9 +10,9 @@ Requires: pdsh-rcmd
 
 # Enabling and disabling pdsh options
 #  defaults:
-#  enabled:  readline, rsh, ssh, dshgroup, netgroup, debug, nodeupdown
-#  disabled: rms, mrsh, qshell, mqshell, xcpu, genders, nodeattr, machines,
-#            slurm
+#  enabled:  readline, rsh, ssh, dshgroup, netgroup, debug, nodeupdown, genders
+#            torque
+#  disabled: rms, mrsh, qshell, mqshell, xcpu, nodeattr, machines, slurm
 #
 #  To build the various module subpackages, pass --with <pkg> on
 #   the rpmbuild command line (if your rpm is a recent enough version)
@@ -34,13 +34,14 @@ Requires: pdsh-rcmd
 %{!?_with_netgroup: %{!?_without_netgroup: %define _with_netgroup --with-netgroup}}
 %{!?_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}}
+%{!?_with_torque: %{!?_without_torque: %define _with_torque --with-torque}}
 # These are default DISABLED.
 %{!?_with_rms: %{!?_without_rms: %define _without_rms --without-rms}}
 %{!?_with_mrsh: %{!?_without_mrsh: %define _without_mrsh --without-mrsh}}
 %{!?_with_qshell: %{!?_without_qshell: %define _without_qshell --without-qshell}}
 %{!?_with_mqshell: %{!?_without_mqshell: %define _without_mqshell --without-mqshell}}
 %{!?_with_xcpu: %{!?_without_xcpu: %define _without_xcpu --without-xcpu}}
-%{!?_with_genders: %{!?_without_genders: %define _without_genders --without-genders}}
 %{!?_with_nodeattr: %{!?_without_nodeattr: %define _without_nodeattr --without-nodeattr}}
 %{!?_with_machines: %{!?_without_machines: %define _without_machines --without-machines}}
 %{!?_with_slurm: %{!?_without_slurm: %define _without_slurm --without-slurm}}
@@ -60,7 +61,8 @@ Requires: pdsh-rcmd
 %{?_with_mqshell:BuildRequires: qsnetlibs}
 BuildRequires: readline-devel
 %{?_with_nodeupdown:BuildRequires: libnodeupdown-devel}
-%{?_with_genders:BuildRequires: genders > 1.0}
+%{?_with_genders:BuildRequires: libgenders-devel > 1.0}
+%{?_with_torque:BuildRequires: torque-devel}
 
 %description
 Pdsh is a multithreaded remote shell client which executes commands
@@ -225,6 +227,15 @@ Requires:  %{name} = %{version}-%{release}
 Pdsh module providing support for gathering the list of target nodes
 from an allocated SLURM job.
 
+%package   mod-torque
+Summary:   Provides support for running pdsh under Torque jobid
+Group:     System Environment/Base
+Requires:  torque
+Requires:  %{name} = %{version}-%{release}
+
+%description mod-torque
+Pdsh module providing support for running pdsh on Torque nodes.
+
 %prep
 %setup -q
 
@@ -260,7 +271,9 @@ from an allocated SLURM job.
     %{?_with_dshgroups}     \
     %{?_without_dshgroups}  \
     %{?_with_netgroup}      \
-    %{?_without_netgroup}
+    %{?_without_netgroup}   \
+    %{?_with_torque}        \
+    %{?_without_torque}
 
 # FIXME: build fails when trying to build with _smp_mflags if qsnet is enabled
 # make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -359,6 +372,11 @@ rm $RPM_BUILD_ROOT/%{_libdir}/pdsh/*a
 %{_libdir}/pdsh/slurm.*
 %endif
 
+%if %{?_with_torque:1}%{!?_with_torque:0}
+%files mod-torque
+%{_libdir}/pdsh/torque.*
+%endif
+
 %if %{?_with_qshell:1}%{!?_with_qshell:0}
 %files qshd
 %{_sbindir}/in.qshd
@@ -386,6 +404,10 @@ fi
 %endif
 
 %changelog
+* Mon Jul 23 2012 Tom Callaway <spot at fedoraproject.org> - 2.26-4
+- enable mod-genders by default (bz810019)
+- enable mod-torque by default
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild