- release 21

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index df2438d8c5e1b57c4ce52878f8bc08b3964fff13..205eea33aaab0211f5c9267b9035b3c83969ee40 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:       13
+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
@@ -564,6 +565,7 @@ Requires:   glibc >= 6:2.3.5
 Requires:      php-dirs
 Requires:      rpm-whiteout >= 1.28
 Requires:      tzdata
+Provides:      php(core) = %{version}
 Provides:      php(date)
 Provides:      php(ereg)
 Provides:      php(libxml)
@@ -574,6 +576,7 @@ Provides:   php(reflection)
 Provides:      php(standard)
 Provides:      php(zend_extension_api) = %{zend_extension_api}
 Provides:      php(zend_module_api) = %{zend_module_api}
+Provides:      php-core
 Provides:      php-date
 Provides:      php-ereg
 %{?with_zend_multibyte:Provides:       php-mbstring = %{epoch}:%{version}-%{release}}
@@ -630,8 +633,8 @@ Requires:   libtool
 %endif
 %{?with_pcre:Requires: pcre-devel >= 6.6}
 Requires:      shtool
-Obsoletes:     php-pear-devel
 Obsoletes:     php-devel
+Obsoletes:     php-pear-devel
 Obsoletes:     php4-devel
 Obsoletes:     php53-devel
 Obsoletes:     php54-devel
@@ -1983,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
@@ -2215,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 \
@@ -2453,25 +2457,24 @@ 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
 
 # install CLI
-libtool --mode=install install -p sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/%{name}
-cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
-echo ".so %{name}.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.1
-ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/php
+libtool --silent --mode=install install sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php.cli
+ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php
+cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1
+echo ".so php.cli.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.1
 
 sed -e 's#%{_prefix}/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 %if %{with fcgi}
@@ -2528,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
 
@@ -2560,13 +2558,13 @@ fi
 %useradd -u 51 -r -s /bin/false -c "HTTP User" -g http http
 
 %post fpm
-/sbin/chkconfig --add php-fpm
-%service php-fpm restart
+/sbin/chkconfig --add %{name}-fpm
+%service %{name}-fpm restart
 
 %preun fpm
 if [ "$1" = 0 ]; then
-       %service php-fpm stop
-       /sbin/chkconfig --del php-fpm
+       %service %{name}-fpm stop
+       /sbin/chkconfig --del %{name}-fpm
 fi
 
 %postun fpm
@@ -2712,8 +2710,8 @@ fi
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/cli.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini
-%attr(755,root,root) %{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1*
+%attr(755,root,root) %{_bindir}/php.cli
+%{_mandir}/man1/php.cli.1*
 
 %files program
 %defattr(644,root,root,755)
@@ -2727,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