packages: php/php.spec - fixup installed sapis in php-config - partial fpm ...

[glen]

Author: glen                         Date: Thu Nov 26 12:16:38 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixup installed sapis in php-config
- partial fpm patch

---- Files affected:
packages/php:
   php.spec (1.822 -> 1.823) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.822 packages/php/php.spec:1.823
--- packages/php/php.spec:1.822	Thu Nov 26 00:01:54 2009
+++ packages/php/php.spec	Thu Nov 26 13:16:33 2009
@@ -57,6 +57,7 @@
 %bcond_without	apache1		# disable building apache 1.3.x module
 %bcond_without	apache2		# disable building apache 2.x module
 %bcond_without	zts		# disable Zend Thread Safety
+%bcond_without	fpm		# fpm patches from http://www.php-fpm.org/
 %bcond_without	suhosin		# with suhosin patch
 %bcond_with	tests		# default off; test process very often hangs on buildersl; perform "make test"
 %bcond_with	type_hints	# experimental support for strict typing/casting
@@ -74,6 +75,11 @@
 %undefine	with_interbase
 %endif
 
+%ifnarch %{ix86} %{x8664}
+# unsupported, see sapi/cgi/fpm/fpm_atomic.h
+%undefine	with_fpm
+%endif
+
 %if %{without apache1} && %{without apache2}
 ERROR: You need to select at least one Apache SAPI to build shared modules.
 %endif
@@ -127,6 +133,9 @@
 Patch32:	%{name}-m4-divert.patch
 Patch38:	%{name}-tds.patch
 Patch39:	%{name}-stupidapache_version.patch
+Patch40:	%{name}-fpm.patch
+#Patch41:	%{name}-fpm-config.patch
+#Patch42:	%{name}-fpm-initdir.patch
 Patch43:	%{name}-use-prog_sendmail.patch
 Patch47:	suhosin.patch
 %if %{with type_hints}
@@ -308,8 +317,8 @@
 php jako moduł DSO (Dynamic Shared Object) dla apache 2.x.
 
 %package cgi
-Summary:	php as CGI/FastCGI program
-Summary(pl.UTF-8):	php jako program CGI/FastCGI
+Summary:	PHP as CGI/FastCGI program
+Summary(pl.UTF-8):	PHP jako program CGI/FastCGI
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	%{name}-fcgi = %{epoch}:%{version}-%{release}
@@ -319,22 +328,22 @@
 Obsoletes:	php-fcgi < 4:5.3.0
 
 %description cgi
-php as CGI or FastCGI program.
+PHP as CGI or FastCGI program.
 
 %description cgi -l pl.UTF-8
-php jako program CGI lub FastCGI.
+PHP jako program CGI lub FastCGI.
 
 %package cli
-Summary:	php as CLI interpreter
-Summary(pl.UTF-8):	php jako interpreter działający z linii poleceń
+Summary:	PHP as CLI interpreter
+Summary(pl.UTF-8):	PHP jako interpreter działający z linii poleceń
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 
 %description cli
-php as CLI interpreter.
+PHP as CLI interpreter.
 
 %description cli -l pl.UTF-8
-php jako interpreter działający z linii poleceń.
+PHP jako interpreter działający z linii poleceń.
 
 %package program
 Summary:	/usr/bin/php symlink
@@ -1631,6 +1640,11 @@
 %patch32 -p1
 %patch38 -p1
 %patch39 -p1
+%if %{with fpm}
+%patch40 -p1
+#%patch41 -p1
+#%patch42 -p1
+%endif
 
 %patch43 -p1
 
@@ -1834,7 +1848,11 @@
 	cp -f config.log config.log.$sapi
 done
 
-# must make this first, so modules can link against it.
+# as we build each SAPI in own make, adjust php-config.in forehead
+sapis=$(awk '/^PHP_SAPI = /{print $3}' Makefile.* | sort -u | xargs)
+sed -i -e "s, at PHP_INSTALLED_SAPIS@,$sapis," "scripts/php-config.in"
+
+# must make libphp_common first, so modules can link against it.
 %{__make} libphp_common.la
 %{__make} build-modules
 
@@ -2738,6 +2756,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.823  2009/11/26 12:16:33  glen
+- fixup installed sapis in php-config
+- partial fpm patch
+
 Revision 1.822  2009/11/25 23:01:54  glen
 - restored -stupidapache_version.patch from php4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.822&r2=1.823&f=u