[rpms/pdsh] epel10: spec file cleanups

[rpms/pdsh] epel10: spec file cleanups

[Tom Callaway]

A new commit has been pushed.

Repo   : rpms/pdsh
Branch : epel10
Commit : d876a14a159b6525402323bbfdda117d90809e08
Author : Tom Callaway <spot@fedoraproject.org>
Date   : 2016-01-19T23:17:12-05:00
Stats  : +39/-35 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/pdsh/c/d876a14a159b6525402323bbfdda117d90809e08?branch=epel10

Log:
spec file cleanups

---
diff --git a/pdsh.spec b/pdsh.spec
index 281f2c8..29ea392 100644
--- a/pdsh.spec
+++ b/pdsh.spec
@@ -2,7 +2,7 @@
 
 Name: pdsh
 Version: 2.31
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Parallel remote shell program
 License: GPLv2+
 Url: https://pdsh.googlecode.com/
@@ -32,24 +32,24 @@ BuildRequires: autoconf, automake, libtool
 
 # 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}}
+%{!?_with_readline: %{!?_without_readline: %global _with_readline --with-readline}}
+%{!?_with_rsh: %{!?_without_rsh: %global _with_rsh --with-rsh}}
+%{!?_with_ssh: %{!?_without_ssh: %global _with_ssh --with-ssh}}
+%{!?_with_dshgroups: %{!?_without_dshgroups: %global _with_dshgroups --with-dshgroups}}
+%{!?_with_netgroup: %{!?_without_netgroup: %global _with_netgroup --with-netgroup}}
+%{!?_with_debug: %{!?_without_debug: %global _with_debug --with-debug}}
+%{!?_with_nodeupdown: %{!?_without_nodeupdown: %global _with_nodeupdown --with-nodeupdown}}
+%{!?_with_genders: %{!?_without_genders: %global _with_genders --with-genders}}
+%{!?_with_torque: %{!?_without_torque: %global _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}}
+%{!?_with_rms: %{!?_without_rms: %global _without_rms --without-rms}}
+%{!?_with_mrsh: %{!?_without_mrsh: %global _without_mrsh --without-mrsh}}
+%{!?_with_qshell: %{!?_without_qshell: %global _without_qshell --without-qshell}}
+%{!?_with_mqshell: %{!?_without_mqshell: %global _without_mqshell --without-mqshell}}
+%{!?_with_xcpu: %{!?_without_xcpu: %global _without_xcpu --without-xcpu}}
+%{!?_with_nodeattr: %{!?_without_nodeattr: %global _without_nodeattr --without-nodeattr}}
+%{!?_with_machines: %{!?_without_machines: %global _without_machines --without-machines}}
+%{!?_with_slurm: %{!?_without_slurm: %global _without_slurm --without-slurm}}
 
 #
 # If "--with debug" is set compile with --enable-debug
@@ -58,7 +58,7 @@ BuildRequires: autoconf, automake, libtool
 # (See /usr/share/doc/rpm-*/conditionalbuilds)
 #
 %if %{?_with_debug:1}%{!?_with_debug:0}
-  %define _enable_debug --enable-debug
+  %global _enable_debug --enable-debug
 %endif
 
 # Macro controlled BuildRequires
@@ -98,7 +98,7 @@ needed by Quadrics MPICH executables.
 Summary:   Provides bsd rcmd capability to pdsh
 Group:     System Environment/Base
 Provides:  pdsh-rcmd
-Requires:  %{name} = %{version}-%{release}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description rcmd-rsh
 Pdsh module for bsd rcmd functionality. Note: This module
@@ -109,7 +109,7 @@ Summary:   Provides ssh rcmd capability to pdsh
 Group:     System Environment/Base
 Provides:  pdsh-rcmd
 Requires:  openssh-clients
-Requires:  %{name} = %{version}-%{release}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description rcmd-ssh
 Pdsh module for ssh rcmd functionality.
@@ -119,7 +119,7 @@ Summary:   Provides qshell rcmd capability to pdsh
 Group:     System Environment/Base
 Provides:  pdsh-rcmd
 Conflicts: pdsh-rcmd-mqshell
-Requires:  %{name} = %{version}-%{release}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description rcmd-qshell
 Pdsh module for running QsNet MPI jobs. Note: This module
@@ -129,7 +129,7 @@ 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}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description rcmd-mrsh
 Pdsh module for mrsh rcmd functionality.
@@ -139,7 +139,7 @@ Summary:   Provides mqshell rcmd capability to pdsh
 Group:     System Environment/Base
 Provides:  pdsh-rcmd
 Conflicts: pdsh-rcmd-qshell
-Requires:  %{name} = %{version}-%{release}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description rcmd-mqshell
 Pdsh module for mqshell rcmd functionality.
@@ -148,7 +148,7 @@ Pdsh module for mqshell rcmd functionality.
 Summary:   Provides xcpu rcmd capability to pdsh
 Group:     System Environment/Base
 Provides:  pdsh-xcpu
-Requires:  %{name} = %{version}-%{release}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description rcmd-xcpu
 Pdsh module for xcpu rcmd functionality.
@@ -159,7 +159,7 @@ Group:     System Environment/Base
 Requires:  genders >= 1.1
 Conflicts: pdsh-mod-nodeattr
 Conflicts: pdsh-mod-machines
-Requires:  %{name} = %{version}-%{release}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description mod-genders
 Pdsh module for libgenders functionality.
@@ -170,7 +170,7 @@ Group:     System Environment/Base
 Requires:  genders 
 Conflicts: pdsh-mod-genders
 Conflicts: pdsh-mod-machines
-Requires:  %{name} = %{version}-%{release}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description mod-nodeattr
 Pdsh module for genders functionality using the nodeattr program.
@@ -179,7 +179,7 @@ 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}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description mod-nodeupdown
 Pdsh module providing -v functionality using libnodeupdown.
@@ -188,7 +188,7 @@ Pdsh module providing -v functionality using libnodeupdown.
 Summary:   Provides RMS support for pdsh
 Group:     System Environment/Base
 Requires:  qsrmslibs
-Requires:  %{name} = %{version}-%{release}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description mod-rms
 Pdsh module providing support for gathering the list of target nodes
@@ -199,7 +199,7 @@ 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}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description mod-machines
 Pdsh module for gathering list of all target nodes from a machines file.
@@ -207,7 +207,7 @@ 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}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description mod-dshgroup
 Pdsh module providing dsh (Dancer's shell) style "group" file support.
@@ -216,7 +216,7 @@ 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}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description mod-netgroup
 Pdsh module providing support for targeting hosts based on netgroup.
@@ -226,7 +226,7 @@ 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}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description mod-slurm
 Pdsh module providing support for gathering the list of target nodes
@@ -236,7 +236,7 @@ from an allocated SLURM job.
 Summary:   Provides support for running pdsh under Torque jobid
 Group:     System Environment/Base
 Requires:  torque
-Requires:  %{name} = %{version}-%{release}
+Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 %description mod-torque
 Pdsh module providing support for running pdsh on Torque nodes.
@@ -299,7 +299,8 @@ fi
 rm $RPM_BUILD_ROOT/%{_libdir}/pdsh/*a
 
 %files
-%doc COPYING README NEWS DISCLAIMER README.KRB4 README.modules README.QsNet
+%doc README NEWS DISCLAIMER README.KRB4 README.modules README.QsNet
+%license COPYING
 %{_bindir}/pdsh
 %{_bindir}/pdcp
 %{_bindir}/dshbak
@@ -410,6 +411,9 @@ fi
 %endif
 
 %changelog
+* Tue Jan 19 2016 Tom Callaway <spot@fedoraproject.org> - 2.31-5
+- spec file cleanups
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.31-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild