- update fpm paths, use upstream paths

Changed files:
    php-fpm.init -> 1.9
    php.spec -> 1.883

diff --git a/php-fpm.init b/php-fpm.init
index e63c2a506b069d067c114a2a228e7c162fab5a20..c675bd8dde08eb7ce130159ecb8b6212e17e6c0d 100644 (file)
--- a/php-fpm.init
+++ b/php-fpm.init
@@ -24,7 +24,7 @@ start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/php-fpm ]; then
                msg_starting "PHP FastCGI Process Manager"
-               daemon --pidfile $pidfile /usr/bin/php.fpm --fpm --fpm-config /etc/php/fpm.conf
+               daemon --pidfile $pidfile /usr/sbin/php-fpm --fpm --fpm-config /etc/php/php-fpm.conf
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/php-fpm
        else
@@ -91,7 +91,7 @@ case "$1" in
        reload USR1 0
        ;;
   status)
-       status php-fpm php.fpm
+       status php-fpm
        RETVAL=$?
        ;;
   *)

diff --git a/php.spec b/php.spec
index af12b13b22d3d077c8743c00c5a65b4efc52f4cc..de20fe69891a14e1c9a4217ff0ac210115f251b2 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -102,7 +102,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define                rel             0.1
+%define                rel             0.2
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -2217,8 +2217,8 @@ cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
 
 # install FCGI PM
 %if %{with fpm}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/fpm.d
-libtool --silent --mode=install install sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_bindir}/php.fpm
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/fpm.d,%{_sbindir}}
+libtool --silent --mode=install install sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir}
 cp -a sapi/fpm/php-fpm.1 $RPM_BUILD_ROOT%{_mandir}/man1
 cp -a sapi/fpm/php-fpm.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -2647,7 +2647,7 @@ fi
 %doc sapi/fpm/LICENSE
 %dir %{_sysconfdir}/fpm.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-fpm.conf
-%attr(755,root,root) %{_bindir}/php.fpm
+%attr(755,root,root) %{_sbindir}/php-fpm
 %{_mandir}/man1/php-fpm.1*
 %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