SPECS: php.spec - sorted module bconds, strict internal php-dom dep

[qboosh]

Author: qboosh                       Date: Thu Mar 23 19:45:30 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sorted module bconds, strict internal php-dom dep

---- Files affected:
SPECS:
   php.spec (1.559 -> 1.560) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.559 SPECS/php.spec:1.560
--- SPECS/php.spec:1.559	Thu Mar 23 19:44:21 2006
+++ SPECS/php.spec	Thu Mar 23 20:45:24 2006
@@ -22,6 +22,7 @@
 %bcond_with	hwapi		# with Hw API support			(BR: proprietary libs)
 %bcond_with	interbase_inst	# use InterBase install., not Firebird	(BR: proprietary libs)
 %bcond_with	oci8		# with Oracle oci8 extension module	(BR: proprietary libs)
+%bcond_without	curl		# without CURL extension module
 %bcond_without	imap		# without IMAP extension module
 %bcond_without	interbase	# with InterBase extension module
 %bcond_without	ldap		# without LDAP extension module
@@ -30,6 +31,7 @@
 %bcond_without	mm		# without mm support for session storage
 %bcond_without	msession	# without msession extension module
 %bcond_without	mssql		# without MS SQL extension module
+%bcond_without	mysqli		# without mysqli support (Requires mysql > 4.1)
 %bcond_without	mime_magic	# without mime-magic module
 %bcond_without	odbc		# without ODBC extension module
 %bcond_without	openssl		# without OpenSSL support and OpenSSL extension (module)
@@ -48,8 +50,6 @@
 %bcond_without	apache2		# disable building apache 2.x module
 %bcond_without	fcgi		# disable building FCGI SAPI
 %bcond_without	zts		# disable experimental-zts
-%bcond_without	curl		# without CURL extension module
-%bcond_without	mysqli		# with mysqli support (Requires mysql > 4.1)
 
 %define apxs1		/usr/sbin/apxs1
 %define	apxs2		/usr/sbin/apxs
@@ -1468,7 +1468,7 @@
 Group:		Libraries
 Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	php-dom
+Requires:	%{name}-dom = %{epoch}:%{version}-%{release}
 
 %description xmlreader
 This is a dynamic shared object (DSO) for PHP that will add XML Reader
@@ -3079,6 +3079,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.560  2006/03/23 19:45:24  qboosh
+- sorted module bconds, strict internal php-dom dep
+
 Revision 1.559  2006/03/23 18:44:21  glen
 - tmpwatch and common dirs moved to php-dirs package, rel 7
 
================================================================

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