packages: php/php.spec - mhash backward compat layer enabled in hash extens...

[glen]

Author: glen                         Date: Sun Aug  7 17:11:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mhash backward compat layer enabled in hash extension only if --with-mhash enabled

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

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.942 packages/php/php.spec:1.943
--- packages/php/php.spec:1.942	Sun Aug  7 12:50:05 2011
+++ packages/php/php.spec	Sun Aug  7 19:11:49 2011
@@ -37,6 +37,7 @@
 %bcond_without	kerberos5	# without Kerberos5 support
 %bcond_without	litespeed	# build litespeed module
 %bcond_without	ldap		# without LDAP extension module
+%bcond_without	mhash		# without mhash extension (supported by hash extension)
 %bcond_without	mm		# without mm support for session storage
 %bcond_without	mssql		# without MS SQL extension module
 # don't turn it on by default; see TODO item for mysqlnd in this spec
@@ -813,9 +814,11 @@
 URL:		http://www.php.net/manual/en/book.gmp.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(hash)
+%if %{with mhash}
 Provides:	php(mhash)
 Provides:	php-mhash = %{epoch}:%{version}-%{release}
 Obsoletes:	php-mhash < 4:5.3.0
+%endif
 Obsoletes:	php-pecl-hash
 
 %description hash
@@ -2046,6 +2049,7 @@
 %if %{with interbase} && %{without interbase_inst}
 	--with-pdo-firebird=shared,/usr \
 %endif
+	%{?with_mhash:--with-mhash=yes} \
 	--with-mysql-sock=/var/lib/mysql/mysql.sock \
 	--with-pdo-mysql=shared%{?with_mysqlnd:,mysqlnd} \
 	%{?with_oci8:--with-pdo-oci=shared%{?with_instantclient:,instantclient,%{_libdir}}} \
@@ -3178,6 +3182,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.943  2011/08/07 17:11:49  glen
+- mhash backward compat layer enabled in hash extension only if --with-mhash enabled
+
 Revision 1.942  2011/08/07 10:50:05  glen
 - split sqlite bcond: sqlite2 and pdo_sqlite
 
================================================================

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