packages: php/php.spec, php/php-fpm.init - update fpm paths, use upstream p...

[glen]

Author: glen                         Date: Sun Jul 25 22:05:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update fpm paths, use upstream paths

---- Files affected:
packages/php:
   php.spec (1.882 -> 1.883) , php-fpm.init (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.882 packages/php/php.spec:1.883
--- packages/php/php.spec:1.882	Sun Jul 25 23:24:47 2010
+++ packages/php/php.spec	Mon Jul 26 00:04:58 2010
@@ -103,7 +103,7 @@
 %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
@@ -2218,8 +2218,8 @@
 
 # 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
@@ -2648,7 +2648,7 @@
 %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
@@ -3123,6 +3123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.883  2010/07/25 22:04:58  glen
+- update fpm paths, use upstream paths
+
 Revision 1.882  2010/07/25 21:24:47  glen
 - fix files for fpm
 

================================================================
Index: packages/php/php-fpm.init
diff -u packages/php/php-fpm.init:1.8 packages/php/php-fpm.init:1.9
--- packages/php/php-fpm.init:1.8	Thu Nov 26 21:45:49 2009
+++ packages/php/php-fpm.init	Mon Jul 26 00:04:58 2010
@@ -24,7 +24,7 @@
 	# 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 @@
 	reload USR1 0
 	;;
   status)
-	status php-fpm php.fpm
+	status php-fpm
 	RETVAL=$?
 	;;
   *)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.882&r2=1.883&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-fpm.init?r1=1.8&r2=1.9&f=u