SPECS (DEVEL): php.spec - adapted to new snap - libtoolize requires --ins...

[zergin]

Author: zergin                       Date: Wed Jun 11 12:28:14 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- adapted to new snap
  - libtoolize requires --install to not remove config.{sub,guess}
  - added php-ac.patch from MAIN (fixes posix build)
- fixed missing filter package (after pcre bcond removal)

---- Files affected:
SPECS:
   php.spec (1.688.2.10 -> 1.688.2.11) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.10 SPECS/php.spec:1.688.2.11
--- SPECS/php.spec:1.688.2.10	Fri May 23 19:07:09 2008
+++ SPECS/php.spec	Wed Jun 11 14:28:09 2008
@@ -65,16 +65,11 @@
 %endif
 
 %if %{without apache1} && %{without apache2}
-ERROR:		You need to select at least one Apache SAPI to build shared modules.
-%endif
-
-# filter depends on pcre
-%if %{without pcre}
-%undefine	with_filter
+ERROR: You need to select at least one Apache SAPI to build shared modules.
 %endif
 
 %define	_rel	0.14
-%define	_snap	200805231030
+%define	_snap	200806111030
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -88,7 +83,7 @@
 License:	PHP
 Group:		Libraries
 Source0:	http://snaps.php.net/%{name}%{version}-%{_snap}.tar.bz2
-# Source0-md5:	dcd0e73852d4d322902f47f32593e223
+# Source0-md5:	93f22cdb11d380b140f891b7259c7a3a
 Source2:	zend.gif
 Source3:	%{name}-mod_%{name}.conf
 Source4:	%{name}-cgi-fcgi.ini
@@ -127,9 +122,9 @@
 Patch25:	%{name}-zlib-for-getimagesize.patch
 Patch26:	%{name}-versioning.patch
 Patch27:	%{name}-linkflags-clean.patch
-Patch28:	%{name}-pear.patch
 Patch29:	%{name}-config-dir.patch
 Patch31:	%{name}-fcgi-graceful.patch
+Patch35:	%{name}-ac.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -1604,10 +1599,9 @@
 %patch25 -p1
 %{?with_versioning:%patch26 -p1}
 
-# just for tabs?!
-%patch28 -p1
 %patch29 -p1
 %patch31 -p1
+%patch35 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -1646,7 +1640,7 @@
 export EXTENSION_DIR="%{php_extensiondir}"
 if [ ! -f _built-conf ]; then # configure once (for faster debugging purposes)
 	rm -f Makefile.{fcgi,cgi,cli,apxs{1,2}} # now remove Makefile copies
-	%{__libtoolize}
+	%{__libtoolize} --install
 	%{__aclocal}
 	./buildconf --force
 	touch _built-conf
@@ -1673,7 +1667,7 @@
 	sapi_args=''
 	case $sapi in
 	cgi)
-		sapi_args=' --disable-fastcgi --enable-discard-path --enable-force-cgi-redirect'
+		sapi_args='--enable-discard-path --enable-force-cgi-redirect'
 	;;
 	cli)
 		sapi_args='--disable-cgi'
@@ -2772,6 +2766,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.688.2.11  2008-06-11 12:28:09  zergin
+- adapted to new snap
+  - libtoolize requires --install to not remove config.{sub,guess}
+  - added php-ac.patch from MAIN (fixes posix build)
+- fixed missing filter package (after pcre bcond removal)
+
 Revision 1.688.2.10  2008-05-23 17:07:09  glen
 - adapter has no brains, you should have it (revert crap caused by adapter and commiter not looking what it did)
 
================================================================

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