SPECS: php.spec - fpm subpackage - install initscript for fpm

[glen]

Author: glen                         Date: Sun Nov 16 15:57:24 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fpm subpackage
- install initscript for fpm

---- Files affected:
SPECS:
   php.spec (1.748 -> 1.749) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.748 SPECS/php.spec:1.749
--- SPECS/php.spec:1.748	Sun Nov 16 16:35:41 2008
+++ SPECS/php.spec	Sun Nov 16 16:57:18 2008
@@ -106,6 +106,7 @@
 Source8:	%{name}_browscap.ini
 Source9:	http://ftp.linux.ee/pub/gentoo/distfiles/distfiles/%{name}-patchset-%{version}-r8.tar.bz2
 # Source9-md5:	0f411800537648d0748417124291bd58
+Source10:	%{name}-fpm.init
 Patch0:		%{name}-shared.patch
 Patch1:		%{name}-pldlogo.patch
 Patch2:		%{name}-mail.patch
@@ -154,6 +155,8 @@
 Patch45:	%{name}-fpm-zts.patch
 Patch46:	%{name}-fpm-libs.patch
 Patch47:	%{name}-fpm-libevent.patch
+Patch48:	%{name}-fpm-config.patch
+Patch49:	%{name}-fpm-initdir.patch
 URL:		http://www.php.net/
 # Requires review:
 # http://securitytracker.com/alerts/2008/Oct/1020995.html
@@ -337,7 +340,6 @@
 Summary(pl.UTF-8):	php jako program FastCGI
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-%{?with_fpm:Requires:	libevent >= 1.4.7-3}
 Provides:	webserver(php) = %{version}
 
 %description fcgi
@@ -384,6 +386,19 @@
 %description program -l pl.UTF-8
 Pakiet dostarczający dowiązanie symboliczne /usr/bin/php do PHP CLI.
 
+%package fpm
+Summary:	PHP FastCGI Process Manager
+Group:		Development/Languages/PHP
+URL:		http://php-fpm.anight.org/
+Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	libevent >= 1.4.7-3
+Requires:	rc-scripts
+Provides:	webserver(php) = %{version}
+
+%description fpm
+PHP FastCGI Process Manager.
+
 %package common
 Summary:	Common files needed by both apache module and CGI
 Summary(pl.UTF-8):	Wspólne pliki dla modułu apache'a i programu CGI
@@ -1653,6 +1668,8 @@
 cd -
 %patch46 -p1
 %patch47 -p1
+%patch48 -p1
+%patch49 -p1
 %endif
 
 # conflict seems to be resolved by recode patches
@@ -1975,6 +1992,7 @@
 libtool --silent --mode=install install sapi/fpm/php-cgi $RPM_BUILD_ROOT%{_bindir}/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
 %endif
 
 # install CLI
@@ -2066,6 +2084,16 @@
 	%service -q httpd restart
 fi
 
+%post fpm
+/sbin/chkconfig --add php-fpm
+%service php-fpm restart
+
+%preun fpm
+if [ "$1" = 0 ]; then
+	%service php-fpm stop
+	/sbin/chkconfig --del php-fpm
+fi
+
 %post	common -p /sbin/ldconfig
 %postun	common -p /sbin/ldconfig
 
@@ -2374,11 +2402,6 @@
 %dir %{_sysconfdir}/cgi-fcgi.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini
 %attr(755,root,root) %{_bindir}/php.fcgi
-%if %{with fpm}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fpm.conf
-%attr(755,root,root) %{_bindir}/php.fpm
-%attr(755,root,root) %{_sbindir}/php-fpm
-%endif
 %endif
 
 %files cgi
@@ -2399,6 +2422,14 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/php
 
+%if %{with fpm}
+%files fpm
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fpm.conf
+%attr(755,root,root) %{_bindir}/php.fpm
+%attr(754,root,root) /etc/rc.d/init.d/php-fpm
+%endif
+
 %files common
 %defattr(644,root,root,755)
 %doc php.ini-*
@@ -2842,6 +2873,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.749  2008/11/16 15:57:18  glen
+- fpm subpackage
+- install initscript for fpm
+
 Revision 1.748  2008/11/16 15:35:41  glen
 - update fpm, daemon startups here, lighttpd can connect to it
 - --disable-cli on other sapis
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.748&r2=1.749&f=u