[cacti/el4: 2/2] conditionally set "su" logrotate parameter

[Ken Dreyer]

commit 5e3850df61587da882a66e154c6329b25581ccae
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date:   Tue Dec 13 09:16:00 2011 -0700

    conditionally set "su" logrotate parameter
    
    Also, correct that pesky changelog date.

 cacti.spec |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/cacti.spec b/cacti.spec
index 42b0f7c..5b620d5 100644
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.7i
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -49,6 +49,13 @@ rm -rf %{buildroot}
 %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf
 %{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/cacti
+
+# The su parameter will trip up older logrotate versions.
+# Conditionally remove it here.
+%if (0%{?fedora} && 0%{?fedora} <= 15) || (0%{?rhel} && 0%{?rhel} <= 6)
+	sed -i %{buildroot}/%{_sysconfdir}/logrotate.d/cacti -e '/^[ \t]*su /d'
+%endif
+
 %{__cp} -a images/ include/ install/ lib/ resource/ %{buildroot}%{_datadir}/%{name}
 %{__cp} %{SOURCE3} ./docs/README.cacti
 %{__cp} -a docs/ %{buildroot}/%{_docdir}/%{name}-%{version}
@@ -107,7 +114,11 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Mon Dec 11 2011 Ken Dreyer <ktdreyer at ktdreyer.com> - 0.8.7i-1
+* 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.
+
+* Mon Dec 12 2011 Ken Dreyer <ktdreyer at ktdreyer.com> - 0.8.7i-1
 - New upstream release (BZ #766573).
 
 * Fri Nov 11 2011 Ken Dreyer <ktdreyer at ktdreyer.com> - 0.8.7h-2