[nagios-plugins-bonding/f20] Correct dependency in package

Trond Hasle Amundsen trondham at fedoraproject.org
Mon Jul 28 16:30:31 UTC 2014


commit d55cde8311cdf24a41f437c2d2c370e21c4b92dc
Author: Trond Hasle Amundsen <t.h.amundsen at usit.uio.no>
Date:   Mon Jul 28 18:30:23 2014 +0200

    Correct dependency in package

 nagios-plugins-bonding.spec |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/nagios-plugins-bonding.spec b/nagios-plugins-bonding.spec
index b40fe99..a71142b 100644
--- a/nagios-plugins-bonding.spec
+++ b/nagios-plugins-bonding.spec
@@ -8,7 +8,7 @@
 
 Name:          nagios-plugins-bonding
 Version:       1.4
-Release:       1%{?dist}
+Release:       3%{?dist}
 Summary:       Nagios plugin to monitor Linux bonding interfaces
 
 Group:         Applications/System
@@ -25,10 +25,10 @@ BuildRequires: libxml2
 BuildRequires: docbook-style-xsl
 
 # Owns the nagios plugins directory
-%if 0%{?rhel} < 6 || 0%{?fedora} < 19
-Requires: nagios-plugins
-%else
+%if 0%{?rhel} > 5 || 0%{?fedora} > 18
 Requires: nagios-common
+%else
+Requires: nagios-plugins
 %endif
 
 # Makes the transition to new package name easier for existing
@@ -47,9 +47,13 @@ interfaces.
 %setup -q -n %{plugin}-%{version}
 
 %build
+%if 0%{?rhel} > 5 || 0%{?fedora} > 18
 pushd man
 make clean && make
 popd
+%else
+: # use pre-built man-pages on old systems
+%endif
 
 %install
 rm -rf %{buildroot}
@@ -67,5 +71,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 28 2014 Trond Hasle Amundsen <t.h.amundsen at usit.uio.no> - 1.4-3
+- Fix specfile bug that resulted in wrong requires for ownership of
+  the nagios plugins directory
+- Conditionalize building man pages for rhel6+ and fedora19+ (others
+  will use pre-built man pages)
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Tue May 13 2014 Trond Hasle Amundsen <t.h.amundsen at usit.uio.no> - 1.4-1
 - Upstream release 1.4


More information about the scm-commits mailing list