[cacti/el4] el4's rpm does not support complex conditionals

Ken Dreyer ktdreyer at fedoraproject.org
Tue Dec 13 18:01:33 UTC 2011


commit 76a3b052375e3106d6d0a4c4292b89ed075691f3
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date:   Tue Dec 13 11:01:37 2011 -0700

    el4's rpm does not support complex conditionals

 cacti.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/cacti.spec b/cacti.spec
index 5b620d5..4322810 100644
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.7i
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -52,7 +52,10 @@ rm -rf %{buildroot}
 
 # The su parameter will trip up older logrotate versions.
 # Conditionally remove it here.
-%if (0%{?fedora} && 0%{?fedora} <= 15) || (0%{?rhel} && 0%{?rhel} <= 6)
+%if 0%{?fedora} && 0%{?fedora} <= 15
+	sed -i %{buildroot}/%{_sysconfdir}/logrotate.d/cacti -e '/^[ \t]*su /d'
+%endif
+%if 0%{?rhel} && 0%{?rhel} <= 6
 	sed -i %{buildroot}/%{_sysconfdir}/logrotate.d/cacti -e '/^[ \t]*su /d'
 %endif
 
@@ -114,6 +117,9 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Tue Dec 13 2011 Ken Dreyer <ktdreyer at ktdreyer.com> - 0.8.7i-2.el4.1
+- el4's rpm does not support complex conditionals
+
 * Tue Dec 13 2011 Ken Dreyer <ktdreyer at ktdreyer.com> - 0.8.7i-2
 - Only set "su" logrotate parameter for F16 and above.
 - Tweak mod_security rules.


More information about the scm-commits mailing list