X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=1284de2fb91b8c60c6caf302eb0e06b7ebc4b118;hb=bbc15e2fb1fda742dea8524c8a4d46face4e4c9a;hp=959fba25b5bf89f612ea23d20a167b4d03133508;hpb=8cb93fd057b989458d7b32948a29aeb69f7ff369;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index 959fba2..1284de2 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:	13
+Release:	15
 Epoch:		4
 License:	PHP
 Group:		Libraries
@@ -564,6 +564,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 +575,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 +632,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
@@ -2452,20 +2454,26 @@ libtool --silent --mode=install install sapi/fcgi/php-cgi $RPM_BUILD_ROOT%{_bind
 
 # install FCGI PM
 %if %{with fpm}
-libtool --silent --mode=install install sapi/fpm/php-cgi $RPM_BUILD_ROOT%{_sbindir}/php.fpm
-%{__make} install-fpm -f Makefile.fpm \
-	INSTALL_ROOT=$RPM_BUILD_ROOT
-install %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/php-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}
+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
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
-install %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/php-fpm
+cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
 %endif
 
 # install CLI
 libtool --silent --mode=install install sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php.cli
-install sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php.1
-echo ".so php.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1
-
 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}
@@ -2554,13 +2562,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
@@ -2585,24 +2593,6 @@ fi
 [ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
 [ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart
 
-%if %{with apache1}
-%triggerpostun -n apache1-mod_php%{php_suffix} -- php < 4:5.0.4-9.11
-sed -i -e '
-	/^AddType application\/x-httpd-php \.php/s,^,#,
-	/^\(Add\|Load\)Module.*php5\.\(so\|c\)/d
-' /etc/apache/apache.conf
-%service -q apache restart
-%endif
-
-%if %{with apache2}
-%triggerpostun -n apache-mod_php%{php_suffix} -- php < 4:5.0.4-7.1
-# for fixed php-SAPI.ini, the poor php-apache.ini was never read for apache2
-if [ -f %{_sysconfdir}/php-apache.ini.rpmsave ]; then
-	cp -f %{_sysconfdir}/php-apache2handler.ini{,.rpmnew}
-	mv -f %{_sysconfdir}/php-apache.ini.rpmsave %{_sysconfdir}/php-apache2handler.ini
-fi
-%endif
-
 # common macros called at extension post/postun scriptlet
 %define	extension_scripts() \
 %post %1 \
@@ -2736,9 +2726,10 @@ fi
 %files fpm
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fpm.conf
-%attr(755,root,root) %{_sbindir}/php-fpm
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/php-fpm
-%attr(754,root,root) /etc/rc.d/init.d/php-fpm
+%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