[pdsh/el5] epel build
Tom Callaway
spot at fedoraproject.org
Fri Sep 7 13:57:56 UTC 2012
commit c2fca7228c9a1eacb81b80328bb666fafe90e5e2
Author: Tom Callaway <spot at fedoraproject.org>
Date: Fri Sep 7 09:58:30 2012 -0400
epel build
pdsh.spec | 256 +++++++++++++++++++++++++++++++++----------------------------
sources | 2 +-
2 files changed, 140 insertions(+), 118 deletions(-)
---
diff --git a/pdsh.spec b/pdsh.spec
index 41ae4f7..47f6ece 100644
--- a/pdsh.spec
+++ b/pdsh.spec
@@ -1,22 +1,18 @@
Name: pdsh
-Version: 2.11
-Release: 5%{?dist}
-
+Version: 2.26
+Release: 4%{?dist}
Summary: Parallel remote shell program
-
-License: GPL
+License: GPLv2+
Url: http://sourceforge.net/projects/pdsh/
Group: System Environment/Base
-Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.bz2
Requires: pdsh-rcmd
-#
# Enabling and disabling pdsh options
# defaults:
-# enabled: readline, rsh, ssh, dshgroup, netgroups
-# disabled: rms, mrsh, qshell, mqshell, xcpu, genders, nodeattr, machines,
-# nodeupdown
+# 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)
@@ -24,48 +20,31 @@ Requires: pdsh-rcmd
# Similarly, to disable various pdsh options pass --without <pkg> on
# the rpmbuild command line.
#
-# This specfile also supports passing the --with and --without through
+# This specfile used to support passing the --with and --without through
# the environment variables PDSH_WITH_OPTIONS and PDSH_WITHOUT_OPTIONS.
# e.g. PDSH_WITH_OPTIONS="qshell genders" rpmbuild ....
-#
-%define _without_env ${PDSH_WITHOUT_OPTIONS}
-%define _with_env ${PDSH_WITH_OPTIONS}
-%define dstr "%%%%"define
-%define check() echo %_%{1}_env|grep -qw %%1 && echo %dstr _%{1}_%%1 --%{1}-%%1
-%{expand: %%define pdsh_with() %%((%{check with})||(%{check without}))%%{nil}}
-%define def() %%{!?_%{2}_%1: %%{!?_%{3}_%1: %%global _%{2}_%1 --%{2}-%1}}
-
-%{expand: %pdsh_with ssh}
-%{expand: %def ssh with without}
-%{expand: %pdsh_with rsh}
-%{expand: %def rsh with without}
-%{expand: %pdsh_with dshgroups}
-%{expand: %def dshgroups with without}
-%{expand: %pdsh_with netgroup}
-%{expand: %def netgroup with without}
-
-%{expand: %pdsh_with mrsh}
-%{expand: %def mrsh without with}
-%{expand: %pdsh_with qshell}
-%{expand: %def qshell without with}
-%{expand: %pdsh_with mqshell}
-%{expand: %def mqshell without with}
-%{expand: %pdsh_with xcpu}
-%{expand: %def xcpu without with}
-%{expand: %pdsh_with genders}
-%{expand: %def genders without with}
-%{expand: %pdsh_with nodeattr}
-%{expand: %def nodeattr without with}
-%{expand: %pdsh_with nodeupdown}
-%{expand: %def nodeupdown without with}
-%{expand: %pdsh_with machines}
-%{expand: %def machines without with}
-%{expand: %pdsh_with slurm}
-%{expand: %def slurm without with}
-%{expand: %pdsh_with rms}
-%{expand: %def rms without with}
-%{expand: %pdsh_with debug}
-%{expand: %def debug without with}
+# Unfortunately, new rpm doesn't tolerate such nonsense, so it doesn't work anymore.
+
+# Read: If neither macro exists, then add the default definition.
+# These are default ENABLED.
+%{!?_with_readline: %{!?_without_readline: %define _with_readline --with-readline}}
+%{!?_with_rsh: %{!?_without_rsh: %define _with_rsh --with-rsh}}
+%{!?_with_ssh: %{!?_without_ssh: %define _with_ssh --with-ssh}}
+%{!?_with_dshgroups: %{!?_without_dshgroups: %define _with_dshgroups --with-dshgroups}}
+%{!?_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_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}}
#
# If "--with debug" is set compile with --enable-debug
@@ -77,49 +56,45 @@ Requires: pdsh-rcmd
%define _enable_debug --enable-debug
%endif
-
+# Macro controlled BuildRequires
%{?_with_qshell:BuildRequires: qsnetlibs}
%{?_with_mqshell:BuildRequires: qsnetlibs}
BuildRequires: readline-devel
-%{?_with_nodeupdown:BuildRequires: whatsup}
-%{?_with_genders:BuildRequires: genders > 1.0}
-
-##############################################################################
-# Pdsh description
+%{?_with_nodeupdown:BuildRequires: libnodeupdown-devel}
+%{?_with_genders:BuildRequires: libgenders-devel > 1.0}
+%{?_with_torque:BuildRequires: torque-devel}
%description
Pdsh is a multithreaded remote shell client which executes commands
on multiple remote hosts in parallel. Pdsh can use several different
remote shell services, including standard "rsh", Kerberos IV, and ssh.
-##############################################################################
%package qshd
Summary: Remote shell daemon for pdsh/qshell/Elan3
Group: System Environment/Base
-Requires: xinetd
+Requires(post): xinetd
+
%description qshd
Remote shell service for running Quadrics Elan3 jobs under pdsh.
Sets up Elan capabilities and environment variables needed by Quadrics
MPICH executables.
-##############################################################################
%package mqshd
Summary: Remote shell daemon for pdsh/mqshell/Elan3
Group: System Environment/Base
-Requires: xinetd
+Requires(post): xinetd
+
%description mqshd
Remote shell service for running Quadrics Elan3 jobs under pdsh with
mrsh authentication. Sets up Elan capabilities and environment variables
needed by Quadrics MPICH executables.
-##############################################################################
-#
-# Module packages:
-#
%package rcmd-rsh
Summary: Provides bsd rcmd capability to pdsh
Group: System Environment/Base
Provides: pdsh-rcmd
+Requires: %{name} = %{version}-%{release}
+
%description rcmd-rsh
Pdsh module for bsd rcmd functionality. Note: This module
requires that the pdsh binary be installed setuid root.
@@ -129,6 +104,8 @@ Summary: Provides ssh rcmd capability to pdsh
Group: System Environment/Base
Provides: pdsh-rcmd
Requires: openssh-clients
+Requires: %{name} = %{version}-%{release}
+
%description rcmd-ssh
Pdsh module for ssh rcmd functionality.
@@ -137,6 +114,8 @@ Summary: Provides qshell rcmd capability to pdsh
Group: System Environment/Base
Provides: pdsh-rcmd
Conflicts: pdsh-rcmd-mqshell
+Requires: %{name} = %{version}-%{release}
+
%description rcmd-qshell
Pdsh module for running QsNet MPI jobs. Note: This module
requires that the pdsh binary be installed setuid root.
@@ -145,6 +124,8 @@ requires that the pdsh binary be installed setuid root.
Summary: Provides mrsh rcmd capability to pdsh
Group: System Environment/Base
Provides: pdsh-rcmd
+Requires: %{name} = %{version}-%{release}
+
%description rcmd-mrsh
Pdsh module for mrsh rcmd functionality.
@@ -153,6 +134,8 @@ Summary: Provides mqshell rcmd capability to pdsh
Group: System Environment/Base
Provides: pdsh-rcmd
Conflicts: pdsh-rcmd-qshell
+Requires: %{name} = %{version}-%{release}
+
%description rcmd-mqshell
Pdsh module for mqshell rcmd functionality.
@@ -160,6 +143,8 @@ Pdsh module for mqshell rcmd functionality.
Summary: Provides xcpu rcmd capability to pdsh
Group: System Environment/Base
Provides: pdsh-xcpu
+Requires: %{name} = %{version}-%{release}
+
%description rcmd-xcpu
Pdsh module for xcpu rcmd functionality.
@@ -169,6 +154,8 @@ Group: System Environment/Base
Requires: genders >= 1.1
Conflicts: pdsh-mod-nodeattr
Conflicts: pdsh-mod-machines
+Requires: %{name} = %{version}-%{release}
+
%description mod-genders
Pdsh module for libgenders functionality.
@@ -178,6 +165,8 @@ Group: System Environment/Base
Requires: genders
Conflicts: pdsh-mod-genders
Conflicts: pdsh-mod-machines
+Requires: %{name} = %{version}-%{release}
+
%description mod-nodeattr
Pdsh module for genders functionality using the nodeattr program.
@@ -185,6 +174,8 @@ Pdsh module for genders functionality using the nodeattr program.
Summary: Provides libnodeupdown support for pdsh
Group: System Environment/Base
Requires: whatsup
+Requires: %{name} = %{version}-%{release}
+
%description mod-nodeupdown
Pdsh module providing -v functionality using libnodeupdown.
@@ -192,6 +183,8 @@ Pdsh module providing -v functionality using libnodeupdown.
Summary: Provides RMS support for pdsh
Group: System Environment/Base
Requires: qsrmslibs
+Requires: %{name} = %{version}-%{release}
+
%description mod-rms
Pdsh module providing support for gathering the list of target nodes
from an allocated RMS resource.
@@ -201,12 +194,16 @@ Summary: Pdsh module for gathering list of target nodes from a machines file
Group: System Environment/Base
Conflicts: pdsh-mod-genders
Conflicts: pdsh-mod-nodeattr
+Requires: %{name} = %{version}-%{release}
+
%description mod-machines
Pdsh module for gathering list of all target nodes from a machines file.
%package mod-dshgroup
Summary: Provides dsh-style group file support for pdsh
Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+
%description mod-dshgroup
Pdsh module providing dsh (Dancer's shell) style "group" file support.
Provides -g groupname and -X groupname options to pdsh.
@@ -214,6 +211,8 @@ Provides -g groupname and -X groupname options to pdsh.
%package mod-netgroup
Summary: Provides netgroup support for pdsh
Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+
%description mod-netgroup
Pdsh module providing support for targeting hosts based on netgroup.
Provides -g groupname and -X groupname options to pdsh.
@@ -222,23 +221,28 @@ Provides -g groupname and -X groupname options to pdsh.
Summary: Provides support for running pdsh under SLURM allocations
Group: System Environment/Base
Requires: slurm
+Requires: %{name} = %{version}-%{release}
+
%description mod-slurm
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
-
-##############################################################################
+%setup -q
%build
-%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
+%configure \
%{?_enable_debug} \
- %{?_with_rsh} \
+ %{?_with_rsh} \
%{?_without_rsh} \
%{?_with_ssh} \
%{?_without_ssh} \
@@ -260,22 +264,22 @@ from an allocated SLURM job.
%{?_without_mrsh} \
%{?_with_mqshell} \
%{?_without_mqshell} \
- %{?_with_xcpu} \
+ %{?_with_xcpu} \
%{?_without_xcpu} \
%{?_with_slurm} \
%{?_without_slurm} \
%{?_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
@@ -288,122 +292,93 @@ 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
%{_bindir}/dshbak
+%{_bindir}/rpdcp
+%dir %{_libdir}/pdsh
+%{_libdir}/pdsh/execcmd.so
%{_mandir}/man1/*
-##############################################################################
%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
@@ -414,11 +389,9 @@ fi
%{_initrddir}/xinetd reload
%endif
-##############################################################################
%if %{?_with_mqshell:1}%{!?_with_mqshell:0}
%files mqshd
-%defattr(-,root,root)
%{_sbindir}/in.mqshd
%{_sysconfdir}/xinetd.d/mqshell
@@ -429,10 +402,59 @@ fi
%{_initrddir}/xinetd reload
%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
+
+* Sun Jun 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.18-2
+- Enable nodeupdown module
+
+* Mon Apr 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.18-1
+- update to 2.18
+
+* Tue Mar 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.17-3
+- fix unowned directories (#473578)
+ and let all module subpackages require the main package
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jan 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.17-1
+- update to 2.17
+- fix netgroup
+
+* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.16-1
+- attempt to make this package suck... less.
+- fix license tag
+- update to 2.16
+- fix compile against glibc 2.8 (ARG_MAX not defined)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.11-6
+- Autorebuild for GCC 4.3
+
* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.11-5
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
diff --git a/sources b/sources
index d106ad9..97c7f4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b67af953de2a86ad90b9a13e97fba89e pdsh-2.11.tar.gz
+7c7860a8d5133eaf4561dae99d922261 pdsh-2.26.tar.bz2
More information about the scm-commits
mailing list