packages: php/php.spec - split sqlite bcond: sqlite2 and pdo_sqlite

[glen]

Author: glen                         Date: Sun Aug  7 10:50:10 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- split sqlite bcond: sqlite2 and pdo_sqlite

---- Files affected:
packages/php:
   php.spec (1.941 -> 1.942) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.941 packages/php/php.spec:1.942
--- packages/php/php.spec:1.941	Wed Aug  3 08:09:53 2011
+++ packages/php/php.spec	Sun Aug  7 12:50:05 2011
@@ -45,12 +45,13 @@
 %bcond_without	odbc		# without ODBC extension module
 %bcond_without	openssl		# without OpenSSL support and OpenSSL extension (module)
 %bcond_without	pcre		# without PCRE extension module
+%bcond_without	pdo_sqlite	# without PDO SQLite extension module
 %bcond_without	pgsql		# without PostgreSQL extension module
 %bcond_without	phar		# without phar extension module
 %bcond_without	pspell		# without pspell extension module
 %bcond_without	recode		# without recode extension module
 %bcond_without	snmp		# without SNMP extension module
-%bcond_without	sqlite		# without SQLite extension module
+%bcond_without	sqlite2		# without SQLite extension module
 %bcond_without	sqlite3		# without SQLite3 extension module
 %bcond_without	sybase_ct	# without Sybase-CT extension module
 %bcond_without	tidy		# without Tidy extension module
@@ -250,8 +251,10 @@
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-build >= 4.4.0
 BuildRequires:	rpmbuild(macros) >= 1.566
-%{?with_sqlite:BuildRequires:	sqlite-devel}
-%{?with_sqlite3:BuildRequires:	sqlite3-devel >= 3.3.9}
+%{?with_sqlite2:BuildRequires:	sqlite-devel}
+%if %{with sqlite3} || %{with pdo_sqlite}
+BuildRequires:	sqlite3-devel >= 3.3.9
+%endif
 BuildRequires:	t1lib-devel
 %{?with_tidy:BuildRequires:	tidy-devel}
 %{?with_odbc:BuildRequires:	unixODBC-devel}
@@ -2048,7 +2051,7 @@
 	%{?with_oci8:--with-pdo-oci=shared%{?with_instantclient:,instantclient,%{_libdir}}} \
 	%{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \
 	%{?with_pgsql:--with-pdo-pgsql=shared} \
-	%{?with_sqlite:--with-pdo-sqlite=shared,/usr} \
+	%{?with_pdo_sqlite:--with-pdo-sqlite=shared,/usr} \
 	--without-libexpat-dir \
 	--enable-overload=shared \
 	--enable-posix=shared \
@@ -2102,7 +2105,8 @@
 	--with-regex=system \
 	%{?with_snmp:--with-snmp=shared} \
 	%{?with_sybase_ct:--with-sybase-ct=shared,/usr} \
-	%{!?with_sqlite:--without-sqlite --without-pdo-sqlite}%{?with_sqlite:--with-sqlite=shared,/usr --enable-sqlite-utf8} \
+	%{!?with_sqlite2:--without-sqlite}%{?with_sqlite2:--with-sqlite=shared,/usr --enable-sqlite-utf8} \
+	%{!?with_pdo_sqlite:--without-pdo-sqlite} \
 	%{__with_without sqlite3 sqlite3 shared,/usr} \
 	--with-t1lib=shared \
 	%{?with_tidy:--with-tidy=shared} \
@@ -2973,7 +2977,7 @@
 %attr(755,root,root) %{php_extensiondir}/pdo_pgsql.so
 %endif
 
-%if %{with sqlite}
+%if %{with pdo_sqlite}
 %files pdo-sqlite
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_sqlite.ini
@@ -3060,7 +3064,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/SPL.ini
 %attr(755,root,root) %{php_extensiondir}/spl.so
 
-%if %{with sqlite}
+%if %{with sqlite2}
 %files sqlite
 %defattr(644,root,root,755)
 %doc ext/sqlite/{README,TODO,CREDITS}
@@ -3174,6 +3178,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.942  2011/08/07 10:50:05  glen
+- split sqlite bcond: sqlite2 and pdo_sqlite
+
 Revision 1.941  2011/08/03 06:09:53  baggins
 - rel 11
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.941&r2=1.942&f=u