[pdsh/el6] epel build

Tom Callaway spot at fedoraproject.org
Fri Sep 7 13:58:33 UTC 2012


commit 563c2df466a3c512430e646c41575fc0111c3732
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Sep 7 09:59:11 2012 -0400

    epel build

 pdsh.spec |   78 +++++++++++++++++++++++++++++++++++++-----------------------
 sources   |    2 +-
 2 files changed, 49 insertions(+), 31 deletions(-)
---
diff --git a/pdsh.spec b/pdsh.spec
index 744ced2..47f6ece 100644
--- a/pdsh.spec
+++ b/pdsh.spec
@@ -1,19 +1,18 @@
 Name: pdsh
-Version: 2.18
-Release: 3%{?dist}
+Version: 2.26
+Release: 4%{?dist}
 Summary: Parallel remote shell program
 License: GPLv2+
 Url: http://sourceforge.net/projects/pdsh/
 Group: System Environment/Base
 Source0: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 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)
@@ -35,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}}
@@ -61,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
@@ -226,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
 
@@ -261,14 +271,15 @@ 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"
 make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 DESTDIR="$RPM_BUILD_ROOT" make install
 if [ -x $RPM_BUILD_ROOT/%{_sbindir}/in.qshd ]; then
@@ -281,11 +292,7 @@ fi
 # .la's don't need to be packaged.
 rm $RPM_BUILD_ROOT/%{_libdir}/pdsh/*a
 
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
 %files
-%defattr(-,root,root,-)
 %doc COPYING README ChangeLog NEWS DISCLAIMER README.KRB4 README.modules README.QsNet
 %{_bindir}/pdsh
 %{_bindir}/pdcp
@@ -297,91 +304,81 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %if %{?_with_rsh:1}%{!?_with_rsh:0}
 %files rcmd-rsh
-%defattr(-,root,root,-)
 %{_libdir}/pdsh/xrcmd.*
 %endif
 
 %if %{?_with_ssh:1}%{!?_with_ssh:0}
 %files rcmd-ssh
-%defattr(-,root,root,-)
 %{_libdir}/pdsh/sshcmd.*
 %endif
 
 %if %{?_with_qshell:1}%{!?_with_qshell:0}
 %files rcmd-qshell
-%defattr(-,root,root,-)
 %{_libdir}/pdsh/qcmd.*
 %endif
 
 %if %{?_with_mrsh:1}%{!?_with_mrsh:0}
 %files rcmd-mrsh
-%defattr(-,root,root,-)
 %{_libdir}/pdsh/mcmd.*
 %endif
 
 %if %{?_with_mqshell:1}%{!?_with_mqshell:0}
 %files rcmd-mqshell
-%defattr(-,root,root,-)
 %{_libdir}/pdsh/mqcmd.*
 %endif
 
 %if %{?_with_xcpu:1}%{!?_with_xcpu:0}
 %files rcmd-xcpu
-%defattr(-,root,root,-)
 %{_libdir}/pdsh/xcpucmd.*
 %endif
 
 %if %{?_with_genders:1}%{!?_with_genders:0}
 %files mod-genders
-%defattr(-,root,root,-)
 %{_libdir}/pdsh/genders.*
 %endif
 
 %if %{?_with_nodeattr:1}%{!?_with_nodeattr:0}
 %files mod-nodeattr
-%defattr(-,root,root,-)
 %{_libdir}/pdsh/nodeattr.*
 %endif
 
 %if %{?_with_nodeupdown:1}%{!?_with_nodeupdown:0}
 %files mod-nodeupdown
-%defattr(-,root,root)
 %{_libdir}/pdsh/nodeupdown.*
 %endif
 
 %if %{?_with_rms:1}%{!?_with_rms:0}
 %files mod-rms
-%defattr(-,root,root,-)
 %{_libdir}/pdsh/rms.*
 %endif
 
 %if %{?_with_machines:1}%{!?_with_machines:0}
 %files mod-machines
-%defattr(-,root,root,-)
 %{_libdir}/pdsh/machines.*
 %endif
 
 %if %{?_with_dshgroups:1}%{!?_with_dshgroups:0}
 %files mod-dshgroup
-%defattr(-,root,root,-)
 %{_libdir}/pdsh/dshgroup.*
 %endif
 
 %if %{?_with_netgroup:1}%{!?_with_netgroup:0}
 %files mod-netgroup
-%defattr(-,root,root,-)
 %{_libdir}/pdsh/netgroup.*
 %endif
 
 %if %{?_with_slurm:1}%{!?_with_slurm:0}
 %files mod-slurm
-%defattr(-,root,root,-)
 %{_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
-%defattr(-,root,root,-)
 %{_sbindir}/in.qshd
 %{_sysconfdir}/xinetd.d/qshell
 
@@ -395,7 +392,6 @@ fi
 
 %if %{?_with_mqshell:1}%{!?_with_mqshell:0}
 %files mqshd
-%defattr(-,root,root)
 %{_sbindir}/in.mqshd
 %{_sysconfdir}/xinetd.d/mqshell
 
@@ -408,6 +404,28 @@ 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
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sun May  1 2011 Tom Callaway <spot at fedoraproject.org> - 2.26-1
+- update to 2.26
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.22-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Sep  9 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.22-1
+- update to 2.22
+
+* Fri Sep  3 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.21-1
+- update to 2.21
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index b291d07..97c7f4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff5dc11f25ce9c7474e71aafb5d293e8  pdsh-2.18.tar.bz2
+7c7860a8d5133eaf4561dae99d922261  pdsh-2.26.tar.bz2


More information about the scm-commits mailing list