commit 49d5c4ee2c59bfa42834288c292bbed477bb48c0 Author: Elan Ruusamäe <g...@delfi.ee> Date: Mon Nov 21 19:11:00 2016 +0200
use alternatives for php-fpm binary php.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- diff --git a/php.spec b/php.spec index 01e06a2..d9fa2ec 100644 --- a/php.spec +++ b/php.spec @@ -498,8 +498,9 @@ Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id Requires(pre): /usr/sbin/useradd Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: rc-scripts +Requires: alternatives Requires: php-dirs >= 1.4-2 +Requires: rc-scripts Provides: php(fpm) Provides: user(http) Provides: webserver(php) = %{version} @@ -2595,6 +2596,9 @@ cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm %{__sed} -i -e '/su/d' $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm %endif +# touch for ghost for alternatives +touch $RPM_BUILD_ROOT%{_sbindir}/php-fpm + %{__sed} -i -e ' s#/usr/lib/php#%{php_extensiondir}# s#/etc/php#%{_sysconfdir}# @@ -2708,11 +2712,13 @@ fi %post fpm /sbin/chkconfig --add %{name}-fpm %service %{name}-fpm restart +update-alternatives --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php%{ver_suffix}-fpm %{ver_suffix} || : %preun fpm if [ "$1" = "0" ]; then %service %{name}-fpm stop /sbin/chkconfig --del %{name}-fpm + update-alternatives --remove php-fpm %{_sbindir}/php-fpm || : fi %postun fpm @@ -2945,6 +2951,7 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-fpm.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fpm.d/www.conf %attr(755,root,root) %{_sbindir}/%{name}-fpm +%ghost %{_sbindir}/php-fpm %{_mandir}/man8/%{name}-fpm.8* %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 ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/49d5c4ee2c59bfa42834288c292bbed477bb48c0 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit