X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=205eea33aaab0211f5c9267b9035b3c83969ee40;hb=9764152e9db33922ebeee2d3a0f553950cbb7dec;hp=0556ecdfc5501ca27f9ecbf21abf7ef910d904d8;hpb=5c0eb3e18877a70c06a27671cab6f57213e46210;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index 0556ecd..205eea3 100644
--- a/php.spec
+++ b/php.spec
@@ -120,7 +120,7 @@ Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирова
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
 Version:	5.2.17
-Release:	16
+Release:	21
 Epoch:		4
 License:	PHP
 Group:		Libraries
@@ -204,6 +204,7 @@ Patch60:	bug-60986.patch
 # http://spot.fedorapeople.org/php-5.3.6-libzip.patch
 Patch65:	system-libzip.patch
 Patch66:	bug-47930.patch
+Patch67:	php-db.patch
 # CENTALT patches
 # CVE
 Patch201: php-5.2.17-CVE-2011-2202.patch
@@ -1985,6 +1986,7 @@ done
 %patch60 -p4
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p2
+%patch67 -p1
 
 %patch201 -p1 -b .CVE-2011-2202
 %patch202 -p1 -b .CVE-2011-1938
@@ -2217,7 +2219,7 @@ for sapi in $sapis; do
 %if %{with fpm}
 	--with-fpm-conf=%{_sysconfdir}/fpm.conf \
 	--with-fpm-log=/var/log/fpm.log \
-	--with-fpm-pid=/var/run/php/fpm.pid \
+	--with-fpm-pid=/var/run/php/%{name}-fpm.pid \
 %endif
 %if %{with mssql} || %{with sybase} || %{with sybase_ct}
 	--with-pdo-dblib=shared \