[packages/php/PHP_5_5] moved C: logrotate to proper subpackage (containing logrotate file)

glen glen at pld-linux.org
Sun May 31 16:01:40 CEST 2015


commit 0443386d0ec978978d275b138d60249da53d67df
Author: Tomasz Pala <gotar at pld-linux.org>
Date:   Sun May 31 14:27:11 2015 +0200

    moved C: logrotate to proper subpackage (containing logrotate file)

 php.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index 79b0089..efadec6 100644
--- a/php.spec
+++ b/php.spec
@@ -438,9 +438,6 @@ Provides:	php(fcgi)
 Provides:	webserver(php) = %{version}
 Obsoletes:	php-cgi < 4:5.3.28-7
 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.
@@ -505,6 +502,9 @@ Provides:	php(fpm)
 Provides:	user(http)
 Provides:	webserver(php) = %{version}
 Obsoletes:	php-fpm < 4:5.3.28-7
+%if "%{pld_release}" != "ac"
+Conflicts:	logrotate < 3.8.0
+%endif
 
 %description fpm
 PHP FastCGI Process Manager.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/0443386d0ec978978d275b138d60249da53d67df



More information about the pld-cvs-commit mailing list