SPECS: php.spec - package pdo_firebird - link pdo-sqlite with shar...

[glen]

Author: glen                         Date: Sun Jan  1 23:25:06 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package pdo_firebird
- link pdo-sqlite with shared sqlite
- link mbstring with shared libmbfl

---- Files affected:
SPECS:
   php.spec (1.537 -> 1.538) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.537 SPECS/php.spec:1.538
--- SPECS/php.spec:1.537	Sun Jan  1 15:26:32 2006
+++ SPECS/php.spec	Mon Jan  2 00:25:01 2006
@@ -14,10 +14,6 @@
 # - make additional headers added by mail patch configurable
 # - apply -hardened patch by default ?
 # - modularize session, standard (output from pure php -m)?
-# - package for pdo-firebird?
-# warning: Installed (but unpackaged) file(s) found:
-#   /etc/php/conf.d/pdo_firebird.ini
-#   /usr/lib/php/pdo_firebird.so
 #
 # Conditional build:
 %bcond_with	db3		# use db3 packages instead of db (4.x) for Berkeley DB support
@@ -84,11 +80,11 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php
 Version:	5.1.1
-%define	_rel 6
+%define	_rel 6.3
 Release:	%{_rel}%{?with_hardening:hardened}
 Epoch:		4
-Group:		Libraries
 License:	PHP
+Group:		Libraries
 Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
 # Source0-md5:	70a7c90de182d1a1901c390b844153c7
 Source1:	FAQ.%{name}
@@ -127,6 +123,7 @@
 Patch30:	%{name}-hardening-fix.patch
 Patch31:	%{name}-both-apxs.patch
 Patch32:	%{name}-builddir.patch
+Patch33:	%{name}-libmbfl-shared.patch
 Icon:		php.gif
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
@@ -156,6 +153,7 @@
 %{?with_imap:BuildRequires:	imap-devel >= 1:2001-0.BETA.200107022325.2}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libltdl-devel >= 1.4
+BuildRequires:	libmbfl-devel
 BuildRequires:	libmcrypt-devel >= 2.4.4
 BuildRequires:	libpng-devel >= 1.0.8
 BuildRequires:	libtiff-devel
@@ -1026,6 +1024,17 @@
 Moduł dla PHP dodający obsługę baz danych FreeTDS za pośrednictwem
 interfejsu PDO.
 
+%package pdo-firebird
+Summary:	PHP Data Objects (PDO) Firebird support
+Group:		Libraries
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
+
+%description pdo-firebird
+This is a dynamic shared object (DSO) for PHP that will add PDO
+Firebird support.
+
 %package pdo-mysql
 Summary:	PHP Data Objects (PDO) MySQL support
 Summary(pl):	Moduł PHP Data Objects (PDO) z obsługą MySQL-a
@@ -1549,6 +1558,7 @@
 %endif
 %patch31 -p1
 %patch32 -p1
+%patch33 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -1556,6 +1566,21 @@
 # new apr
 sed -i -e 's#apr-config#apr-1-config#g' sapi/apache*/*.m4
 
+# remove all bundled libraries not to link with them accidentally
+#rm -rf ext/sqlite/libsqlite
+#rm -rf ext/bcmath/libbcmath
+#rm -rf ext/date/lib
+#rm -rf ext/dba/libcdb
+#rm -rf ext/dba/libflatfile
+#rm -rf ext/dba/libinifile
+#rm -rf ext/gd/libgd
+rm -rf ext/mbstring/libmbfl
+#rm -rf ext/mbstring/oniguruma
+rm -rf ext/pcre/pcrelib
+rm -rf ext/pdo_sqlite/sqlite
+#rm -rf ext/soap/interop
+rm -rf ext/xmlrpc/libxmlrpc
+
 %build
 if API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h) && [ $API != %{php_api_version} ]; then
 	echo "Set %%define php_api_version to $API and rerun."
@@ -1647,7 +1672,7 @@
 	--enable-gd-jus-conf \
 	--enable-libxml \
 	--enable-magic-quotes \
-	--enable-mbstring=shared,all \
+	--enable-mbstring=shared,all --with-libmbfl=%{_prefix} \
 	--enable-mbregex \
 	--enable-pcntl=shared \
 	--enable-pdo=shared \
@@ -1661,7 +1686,7 @@
 	%{?with_oci8:--with-pdo-oci=shared} \
 	%{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \
 	%{?with_pgsql:--with-pdo-pgsql=shared} \
-	%{?with_sqlite:--with-pdo-sqlite=shared} \
+	%{?with_sqlite:--with-pdo-sqlite=shared,/usr} \
 	--enable-posix=shared \
 	--enable-session \
 	--enable-shared \
@@ -2219,6 +2244,12 @@
 %postun pdo-dblib
 %extension_postun
 
+%post pdo-firebird
+%extension_post
+
+%postun pdo-firebird
+%extension_postun
+
 %post pdo-mysql
 %extension_post
 
@@ -2852,6 +2883,13 @@
 %attr(755,root,root) %{extensionsdir}/pdo_dblib.so
 %endif
 
+%if %{with interbase} && %{without interbase_inst}
+%files pdo-firebird
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_firebird.ini
+%attr(755,root,root) %{extensionsdir}/pdo_firebird.so
+%endif
+
 %files pdo-mysql
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_mysql.ini
@@ -3038,6 +3076,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.538  2006/01/01 23:25:01  glen
+- package pdo_firebird
+- link pdo-sqlite with shared sqlite
+- link mbstring with shared libmbfl
+
 Revision 1.537  2006/01/01 14:26:32  glen
 - sqlite ext links with pdo symbols. bug?
 
================================================================

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