Hi.

I managed to get php-4.3.0-3mdk + db4 to work, patches applied to this mail.

Chears.
-- 
Regards // Oden Eriksson, Deserve-IT.com

Attachment: php-4.3.0-db4.patch.bz2
Description: BZip2 compressed data

--- php-dba_bundle.spec	2003-01-08 03:20:54.000000000 +0100
+++ php-dba_bundle.spec.oden	2003-01-09 18:49:06.000000000 +0100
@@ -2,15 +2,15 @@
 %define _docdir %{_datadir}/doc/%{name}-%{version}
 %{expand:%(cat /usr/src/php-devel/PHP_BUILD||(echo -e "error: failed build dependencies:\n        php-devel >= 430 (4.3.0) is needed by this package." >/dev/stderr;kill -2 $PPID))}
 
-%define release 1mdk
+%define release 2mdk
 
-%define realname dba (with cdb, gdbm and db3)
+%define realname dba (with cdb, gdbm and db4)
 %define modname dba
 %define dirname %{modname}
 %define soname %{modname}.so
 %define inifile 16_%{modname}.ini
-%define rlibs libgdbm2 db3
-%define blibs libgdbm2-devel libdb3.3-devel
+%define rlibs libgdbm2 db4
+%define blibs libgdbm2-devel db4-devel
 
 
 Summary:	The %{realname} module for PHP
@@ -26,11 +26,10 @@
 BuildRequires:  php%{libversion}-devel
 BuildRequires:	%{blibs}
 BuildRoot:	%{_tmppath}/%{name}-root
-Provides:       php-dba_gdbm_db2 php-cdb php-db2 php-db3 php-db3
-Obsoletes:      php-dba_gdbm_db2 php-cdb php-db2 php-db3 php-db3
+Provides:       php-dba_gdbm_db2 php-cdb php-db2 php-db3 php-db3 php-db4
+Obsoletes:      php-dba_gdbm_db2 php-cdb php-db2 php-db3 php-db3 php-db4
 Provides: 	ADVXpackage
 
-
 %description
 The %{name} package is a dynamic shared object (DSO) that adds
 %{realname} support to PHP. 
@@ -54,7 +53,7 @@
 
 phpize
 aclocal
-%configure --with-gdbm --with-db3 --with-cdb --with-flatfile
+%configure --with-gdbm --with-db4 --with-cdb --with-flatfile
 %make
 mv modules/*.so .
 
@@ -92,6 +91,9 @@
 %config(noreplace) %{_sysconfdir}/php/%{inifile}
 
 %changelog
+* Thu Jan 09 2003 Oden Eriksson <[EMAIL PROTECTED]> 4.3.0-2mdk
+- added db4 support
+
 * Sun Jan  5 2003 Jean-Michel Dault <[EMAIL PROTECTED]> 4.3.0-1mdk
 - New 4.3.0 release
 - Totally macroize based on suggestions from Alexander Skwar
@@ -161,3 +163,4 @@
 - Split dba_gdbm_db3 package from php package so that when a new gdbm, db2
   or db3 package comes out, we don't have to recompile php, only this module
 
+
--- php.spec	2003-01-08 05:24:58.000000000 +0100
+++ php.spec.oden	2003-01-09 18:40:47.000000000 +0100
@@ -2,7 +2,7 @@
 %define	peardir	%{_datadir}/pear
 %define libversion 430
 %define phpversion 4.3.0
-%define phprelease 1mdk
+%define phprelease 3mdk
 
 #The external_modules definition has been put in the %%build section
 #to clean things a bit
@@ -23,6 +23,7 @@
 Patch3:		php-4.3.0-info.patch.bz2
 Patch4:		php-4.3.0-64bit.patch.bz2
 Patch6:		php-4.3.0-fix-pear.patch.bz2
+Patch7:		php-4.3.0-db4.patch.bz2
 # Stolen from PLD
 Patch14:	php-4.3.0-mail.patch.bz2
 Patch15:	php-4.3.0-mcal-shared-lib.patch.bz2
@@ -35,6 +36,7 @@
 BuildRequires:	zlib-devel
 BuildRequires:	glibc-devel
 BuildRequires:	gettext-devel
+#BuildRequires:	autoconf2.5
 BuildRoot:	%{_tmppath}/%{name}-%{version}
 Provides: 	ADVXpackage
 
@@ -169,6 +171,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
+%patch7 -p1
 
 # Stolen from PLD
 %patch14 -p1
@@ -226,6 +229,11 @@
 chmod 755 php-devel/buildext
 
 %build
+
+# OE: we should run buildconf if applied patches changes the configure stuff...
+# but currently I'm just too lazy to fix P1 ;)
+#./buildconf
+
 %serverbuild
 
 #For eventual compatibility with RedHat
@@ -323,6 +331,7 @@
     --without-dba \
     --without-db2 \
     --without-db3 \
+    --without-db4 \
     `for i in %{external_modules}; do echo --without-${i} --disable-${i}; done` \
     --without-gdbm 
 
@@ -439,6 +448,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Jan 09 2003 Oden Eriksson <[EMAIL PROTECTED]> 4.3.0-3mdk
+- added P7 (db4 support from CVS) Yihaa!
+
 * Tue Jan 07 2003 Jean-Michel Dault <[EMAIL PROTECTED]> 4.3.0-2mdk
 - Put all extensions in the EXTERNAL_MANDRAKE_MODULES hack.
 - Add Provides: ADVXpackage, all ADVX package will have this tag, 

Reply via email to