rpms/php-extras/EL-5 php-extras.spec,1.11,1.12

[Dmitry Butskoy]

Author: buc

Update of /cvs/extras/rpms/php-extras/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23764

Modified Files:
	php-extras.spec 
Log Message:



Index: php-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/php-extras/EL-5/php-extras.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- php-extras.spec	20 Jun 2007 12:40:42 -0000	1.11
+++ php-extras.spec	12 May 2009 16:08:06 -0000	1.12
@@ -2,16 +2,18 @@
 
 %define def()	%%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}}
 
-%{expand:%def dbase}
 %{expand:%def readline}
 #  recode
 %{expand:%def mcrypt}
 %{expand:%def mhash}
 %{expand:%def tidy}
 %{expand:%def mssql}
+%{expand:%def interbase}
 
 
-%define list	%{?_with_dbase:dbase} %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_tidy:tidy} %{?_with_mssql:mssql}
+%define list	%{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_tidy:tidy} %{?_with_mssql:mssql pdo_dblib} %{?_with_interbase:interbase pdo_firebird}
+
+%define opts	%{?_with_interbase:--with_interbase=%{_libdir}/firebird --with-pdo-firebird=%{_libdir}/firebird}
 
 
 %global extdir	%(php-config --extension-dir 2>/dev/null || echo "undefined")
@@ -22,7 +24,7 @@ Name: php-extras
 Summary: Additional PHP modules from the standard PHP distribution
 #Version: %(php-config --version 2>/dev/null || echo 0)
 Version: 5.1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Languages
 License: The PHP License
 URL: http://www.php.net/
@@ -41,15 +43,6 @@ This package contains various additional
 have not been included in the basic PHP package for Fedora Core.
 
 
-%package -n php-dbase
-Summary: Standard dBase module for PHP applications
-Group: Development/Languages
-Requires: php >= %{version}, php-api = %{apiver}
-
-%description -n php-dbase
-Standard dBase module for PHP applications
-
-
 %package -n php-readline
 Summary: Standard PHP module provides readline library support
 Group: Development/Languages
@@ -103,19 +96,33 @@ Standard PHP module provides tidy librar
 %package -n php-mssql
 Summary: Standard PHP module provides mssql support
 Group: Development/Languages
-Requires: php >= %{version}, php-api = %{apiver}
+Requires: php >= %{version}, php-api = %{apiver}, php-pdo >= %{version}
+Provides: php_database
 %{?_with_mssql:BuildRequires: freetds-devel}
 
 %description -n php-mssql
 Standard PHP module provides mssql support
 
 
+%package -n php-interbase
+Summary: Standard PHP module provides interbase/firebird support
+Group: Development/Languages
+Requires: php >= %{version}, php-api = %{apiver}, php-pdo >= %{version}
+Provides: php_database, php-firebird
+%{?_with_interbase:BuildRequires: firebird-devel}
+
+%description -n php-interbase
+Standard PHP module provides interbase/firebird support
+
 
 %prep
 %setup -q -n php-%{version}
 %patch1 -p1
 %patch2 -p1
 
+# avoid tests which requires databases
+rm -rf ext/{mssql,pdo_dblib,interbase,pdo_firebird}/tests
+
 
 %build
 
@@ -127,7 +134,7 @@ do
     pushd ext/$mod
 
     phpize
-    %configure --with-libdir=%{_lib}
+    %configure --with-libdir=%{_lib} %{opts}
 
     # cause libtool to avoid passing -rpath when linking
     # (this hack is well-known as "libtool rpath workaround")
@@ -235,6 +242,9 @@ EOF
 EOF
 done
 
+%{?_with_mssql:cat files.pdo_dblib >>files.mssql}
+%{?_with_interbase:cat files.pdo_firebird >>files.interbase}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -249,10 +259,16 @@ rm -rf $RPM_BUILD_ROOT
 %{expand:%fil mhash}
 %{expand:%fil tidy}
 %{expand:%fil mssql}
+%{expand:%fil interbase}
 
 
 
 %changelog
+* Tue May 12 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.6-5
+- add pdo_dblib module for php-mssql
+- add php-interbase support (both interbase and pdo_firebird modules)
+  (initial patch from Remi Collet <fedora at famillecollet.com>)
+
 * Wed Jun 20 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.6-4
 - add patch for mssql (#244736), a backport of some php-5.2 changes