X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php.spec;h=7179ac8b0dcdd22207ee8f506727afae0d2841ea;hp=6b39e55f0e7dbdd423707e39544680070ac99d51;hb=835297dfbd7c0ac9c68b5909a95e251e5f0caf1e;hpb=c4b966583c3423cbb9ceaee5ae30e984e8b8671b

diff --git a/php.spec b/php.spec
index 6b39e55..7179ac8 100644
--- a/php.spec
+++ b/php.spec
@@ -118,7 +118,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define		php_suffix %{nil}
 %endif
 
-%define		rel	1
+%define		rel	2
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -126,13 +126,13 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	5.3.22
+Version:	5.3.23
 Release:	%{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	bf351426fc7f97aa13914062958a6100
+# Source0-md5:	ab7bd1dd3bbc8364cb9fcaa2d79fb502
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -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}#