- rel 20 ; fix php 5.3 build

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 1284de2fb91b8c60c6caf302eb0e06b7ebc4b118..5c8380195c7e9d3617da4268f28a7ab84a5a885d 100644 (file)
--- 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:       15
+Release:       20
 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 \
@@ -2455,16 +2457,15 @@ libtool --silent --mode=install install sapi/fcgi/php-cgi $RPM_BUILD_ROOT%{_bind
 # install FCGI PM
 %if %{with fpm}
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/fpm.d,%{_sbindir}}
-libtool --mode=install install -p sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir}/%{name}-fpm
-cp -p sapi/fpm/php-fpm.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}-fpm.8
-cp -p sapi/fpm/php-fpm.conf $RPM_BUILD_ROOT%{_sysconfdir}
+libtool --mode=install install -p sapi/fpm/php-cgi $RPM_BUILD_ROOT%{_sbindir}/%{name}-fpm
+cp -p sapi/fpm/fpm/php-fpm.conf $RPM_BUILD_ROOT%{_sysconfdir}/fpm.conf
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm
 %{__sed} -i -e '
        s#/usr/lib/php#%{php_extensiondir}#
        s#/etc/php#%{_sysconfdir}#
        s#@processname@#%{name}-fpm#g
-' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf
+' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm $RPM_BUILD_ROOT%{_sysconfdir}/fpm.conf
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
 cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
 %endif
@@ -2530,11 +2531,6 @@ install -d $RPM_BUILD_ROOT%{php_data_dir}/tests/php
 install -p run-tests.php $RPM_BUILD_ROOT%{php_data_dir}/tests/php/run-tests.php
 cp -a tests/* $RPM_BUILD_ROOT%{php_data_dir}/tests/php
 
-%if %{with fpm}
-# /var/run/php is in php-dirs, here conflicts with __spec_install_post_check_tmpfiles macro
-rmdir $RPM_BUILD_ROOT/var/run/php
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -2729,7 +2725,6 @@ fi
 %attr(755,root,root) %{_sbindir}/%{name}-fpm
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}-fpm
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-fpm
-%{_mandir}/man8/%{name}-fpm.8
 %endif
 
 %files common