commit aa6fbcd1fd78149071b440355399d7da73f0be17
Author: Elan Ruusamäe <[email protected]>
Date: Wed Sep 2 14:52:45 2015 +0300
make logrotate compatible with ac
cacti.spec | 6 ++++++
1 file changed, 6 insertions(+)
---
diff --git a/cacti.spec b/cacti.spec
index 78a1597..a3aa459 100644
--- a/cacti.spec
+++ b/cacti.spec
@@ -57,7 +57,9 @@ Provides: cacti(pia) = %{pia_ver}
Provides: user(cacti)
Obsoletes: cacti-add_template
Obsoletes: cacti-plugin-update
+%if "%{pld_release}" != "ac"
Conflicts: logrotate < 3.8.0
+%endif
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -187,6 +189,10 @@ mv
$RPM_BUILD_ROOT{%{_appdir}/include,%{_sysconfdir}}/config.php
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+%if "%{pld_release}" == "ac"
+%{__sed} -i -e '/su/d' $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+%endif
+
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cacti.git/commitdiff/e38b820729769908aa1644804d3d4656b2872b03
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
