rpms/pdsh/FC-4 pdsh.spec,1.5,1.6

[Ben Woodard (kg6fnk)]

Author: kg6fnk

Update of /cvs/extras/rpms/pdsh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23845

Modified Files:
	pdsh.spec 
Log Message:
hard coded readline-deel dep. added netgroup and dshgrp extra packages.


Index: pdsh.spec
===================================================================
RCS file: /cvs/extras/rpms/pdsh/FC-4/pdsh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pdsh.spec	31 Jul 2006 23:44:51 -0000	1.5
+++ pdsh.spec	25 Aug 2006 00:00:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name: pdsh
 Version: 2.11
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 Summary: Parallel remote shell program
 
@@ -14,9 +14,9 @@
 #
 # Enabling and disabling pdsh options
 #  defaults:
-#  enabled:  readline, rsh, ssh
+#  enabled:  readline, rsh, ssh, dshgroup, netgroups
 #  disabled: rms, mrsh, qshell, mqshell, xcpu, genders, nodeattr, machines,
-#            nodeupdown, dshgroup, netgroups
+#            nodeupdown
 #
 #  To build the various module subpackages, pass --with <pkg> on
 #   the rpmbuild command line (if your rpm is a recent enough version)
@@ -39,8 +39,10 @@
 %{expand: %def ssh with without}
 %{expand: %pdsh_with rsh}
 %{expand: %def rsh with without}
-%{expand: %pdsh_with readline}
-%{expand: %def readline 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}
@@ -56,10 +58,6 @@
 %{expand: %def nodeattr without with}
 %{expand: %pdsh_with nodeupdown}
 %{expand: %def nodeupdown without with}
-%{expand: %pdsh_with dshgroups}
-%{expand: %def dshgroups without with}
-%{expand: %pdsh_with netgroup}
-%{expand: %def netgroup without with}
 %{expand: %pdsh_with machines}
 %{expand: %def machines without with}
 %{expand: %pdsh_with slurm}
@@ -82,7 +80,7 @@
 
 %{?_with_qshell:BuildRequires: qsnetlibs}
 %{?_with_mqshell:BuildRequires: qsnetlibs}
-%{?_with_readline:BuildRequires: readline-devel}
+BuildRequires: readline-devel
 %{?_with_nodeupdown:BuildRequires: whatsup}
 %{?_with_genders:BuildRequires: genders > 1.0}
 
@@ -209,7 +207,6 @@
 %package   mod-dshgroup
 Summary:   Provides dsh-style group file support for pdsh
 Group:     System Environment/Base
-Requires:  whatsup
 %description mod-dshgroup
 Pdsh module providing dsh (Dancer's shell) style "group" file support.
 Provides -g groupname and -X groupname options to pdsh.
@@ -217,7 +214,6 @@
 %package   mod-netgroup
 Summary:   Provides netgroup support for pdsh
 Group:     System Environment/Base
-Requires:  whatsup
 %description mod-netgroup
 Pdsh module providing support for targeting hosts based on netgroup.
 Provides -g groupname and -X groupname options to pdsh.
@@ -437,6 +433,13 @@
 
 
 %changelog
+* Thu Aug 24 2006 Ben Woodard <woodard at redhat.com> 2.11-3
+- Remove whatsup requirement for dshgrp and netgroup
+- Enable dshgroup and netgroup by default
+
+* Mon Jul 31 2006 Ben Woodard <woodard at redhat.com> 2.11-2
+- Hardcode readline-devel dependency.
+
 * Mon Jul 31 2006 Ben Woodard <woodard at redhat.com> 2.11-1
 - Track upstream version
 - Added dependency on openssh-clients for rcmd-ssh