add su directive for logrotate 3.8.0

diff --git a/php-fpm.logrotate b/php-fpm.logrotate
index b192547775397aeac21a39a54fe0f583bf04ee09..13d2a3486d2dd718de6e38f67e4464e57bcd9f4d 100644 (file)
--- a/php-fpm.logrotate
+++ b/php-fpm.logrotate
@@ -1,6 +1,7 @@
 /var/log/php/@processname@.log
 /var/log/php/@processname@-slow.log
 {
+       su root http
        notifempty
        missingok
        create 600 root root

diff --git a/php.spec b/php.spec
index 9bc0260f346cb59ac413ae5397957fd56d75213a..d246e45d77c0a99150382187e82761f13c9ba8f8 100644 (file)
--- 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}#