commit 479e9ea454a6ca6b9771e2e114c39e2df8459fce
Author: Elan Ruusamäe <[email protected]>
Date: Mon Mar 4 10:34:17 2013 +0200
add su directive for logrotate 3.8.0
php-fpm.logrotate | 1 +
php.spec | 6 ++++++
2 files changed, 7 insertions(+)
---
diff --git a/php.spec b/php.spec
index 9bc0260..d246e45 100644
--- a/php.spec
+++ b/php.spec
@@ -427,6 +427,9 @@ Group: Development/Languages/PHP
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Provides: php(cgi)
Provides: webserver(php) = %{version}
+%if "%{pld_release}" != "ac"
+Conflicts: logrotate < 3.8.0
+%endif
%description cgi
php as CGI program.
@@ -2320,6 +2323,9 @@ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm
install -d $RPM_BUILD_ROOT/etc/logrotate.d
cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
+%if "%{pld_release}" == "ac"
+%{__sed} -i -e '/su/d' $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
+%endif
%{__sed} -i -e '
s#/usr/lib/php#%{php_extensiondir}#
diff --git a/php-fpm.logrotate b/php-fpm.logrotate
index b192547..13d2a34 100644
--- a/php-fpm.logrotate
+++ b/php-fpm.logrotate
@@ -1,6 +1,7 @@
/var/log/php/@[email protected]
/var/log/php/@[email protected]
{
+ su root http
notifempty
missingok
create 600 root root
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/479e9ea454a6ca6b9771e2e114c39e2df8459fce
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
