SPECS: php.spec - dropped db3 bcond and allow-db31 patch

[qboosh]

Author: qboosh                       Date: Fri Dec 22 22:07:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped db3 bcond and allow-db31 patch

---- Files affected:
SPECS:
   php.spec (1.642 -> 1.643) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.642 SPECS/php.spec:1.643
--- SPECS/php.spec:1.642	Fri Dec 22 23:01:25 2006
+++ SPECS/php.spec	Fri Dec 22 23:07:11 2006
@@ -10,7 +10,6 @@
 # - modularize session, standard (output from pure php -m)?
 #
 # Conditional build:
-%bcond_with	db3		# use db3 packages instead of db (4.x) for Berkeley DB support
 %bcond_with	fdf		# with FDF (PDF forms) module		(BR: proprietary lib)
 %bcond_with	hardening	# build with hardening patch applied (http://www.hardened-php.net/)
 %bcond_with	interbase_inst	# use InterBase install., not Firebird	(BR: proprietary libs)
@@ -105,7 +104,6 @@
 Patch10:	%{name}-ini.patch
 Patch11:	%{name}-acam.patch
 Patch12:	%{name}-curl.patch
-Patch14:	%{name}-allow-db31.patch
 Patch15:	%{name}-threads-acfix.patch
 Patch16:	%{name}-tsrmlsfetchgcc2.patch
 Patch17:	%{name}-no_pear_install.patch
@@ -135,8 +133,7 @@
 BuildRequires:	bzip2-devel
 %{?with_curl:BuildRequires:	curl-devel >= 7.12.0}
 BuildRequires:	cyrus-sasl-devel
-%{!?with_db3:BuildRequires:	db-devel >= 4.0}
-%{?with_db3:BuildRequires:	db3-devel >= 3.1}
+BuildRequires:	db-devel >= 4.0
 BuildRequires:	elfutils-devel
 %if %{with xmlrpc}
 BuildRequires:	expat-devel
@@ -1559,7 +1556,6 @@
 # conditionally...
 %patch11 -p1
 %patch12 -p1
-%patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
@@ -1730,7 +1726,7 @@
 	--enable-xmlreader=shared \
 	--with-bz2=shared \
 	%{!?with_curl:--without-curl}%{?with_curl:--with-curl=shared} \
-	%{?with_db3:--with-db3}%{!?with_db3:--with-db4} \
+	--with-db4 \
 	--enable-dbase=shared \
 %if %{with xmlrpc}
 	--with-expat-dir=shared,/usr \
@@ -2717,6 +2713,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.643  2006/12/22 22:07:11  qboosh
+- dropped db3 bcond and allow-db31 patch
+
 Revision 1.642  2006/12/22 22:01:25  qboosh
 - interbase enabled by default (except ppc - broken on th-ppc)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.642&r2=1.643&f=u