From db9dad5e24666b23a94ff1a1631f1dc0bd715757 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 4 Mar 2013 10:34:17 +0200 Subject: [PATCH] add su directive for logrotate 3.8.0 --- php-fpm.logrotate | 1 + php.spec | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/php-fpm.logrotate b/php-fpm.logrotate index 24172c6..3e4c230 100644 --- 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 74c4a3b..1ff4338 100644 --- a/php.spec +++ b/php.spec @@ -442,6 +442,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. @@ -2434,6 +2437,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}# -- 2.44.0