add su directive for logrotate 3.8.0

diff --git a/php-fpm.logrotate b/php-fpm.logrotate
index 24172c6c7f9690b55cec533180638816a649ebbe..3e4c2304be72bcc519b2c45ec99ec6d83c30193c 100644 (file)
--- a/php-fpm.logrotate
+++ b/php-fpm.logrotate
@@ -1,5 +1,6 @@
 /var/log/php/@processname@.log
 {
+       su root http
        notifempty
        missingok
        create 600 root root

diff --git a/php.spec b/php.spec
index 6b39e55f0e7dbdd423707e39544680070ac99d51..189f8356f01683f892a369a3e1abd75991ff6617 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -430,6 +430,9 @@ Provides:   php(cgi)
 Provides:      php(fcgi)
 Provides:      webserver(php) = %{version}
 Obsoletes:     php-fcgi < 4:5.3.0
+%if "%{pld_release}" != "ac"
+Conflicts:     logrotate < 3.8.0
+%endif
 
 %description cgi
 PHP as CGI or FastCGI program.
@@ -2437,6 +2440,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}#