packages: php/php.spec - PHP_5_2: - simplexml requires spl - dep-tests:...

[glen]

Author: glen                         Date: Tue Mar 16 10:00:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- PHP_5_2:
  - simplexml requires spl
  - dep-tests: get the sort order same way php loads (ini files sorting); rel 13
  - BR: pkgconfig

---- Files affected:
packages/php:
   php.spec (1.856 -> 1.857) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.856 packages/php/php.spec:1.857
--- packages/php/php.spec:1.856	Tue Mar 16 10:56:56 2010
+++ packages/php/php.spec	Tue Mar 16 11:00:28 2010
@@ -214,6 +214,7 @@
 %{?with_snmp:BuildRequires:	net-snmp-devel >= 5.0.7}
 BuildRequires:	pam-devel
 %{?with_pcre:BuildRequires:	pcre-devel >= 6.6}
+BuildRequires:	pkgconfig
 %{?with_pgsql:BuildRequires:	postgresql-backend-devel >= 7.2}
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	readline-devel
@@ -427,6 +428,7 @@
 # because of dlclose() bugs in glibc <= 2.3.4 causing SEGVs on exit
 Requires:	glibc >= 6:2.3.5
 Requires:	php-dirs
+Requires:	rpm-whiteout >= 1.28
 Provides:	php(date)
 Provides:	php(ereg)
 Provides:	php(hash)
@@ -1334,6 +1336,7 @@
 Group:		Libraries
 URL:		http://www.php.net/manual/en/book.simplexml.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	php(simplexml)
 
 %description simplexml
@@ -2069,7 +2072,7 @@
 generate_inifiles
 
 # Check that the module inner-dependencies are intact
-PHP=./sapi/cli/php EXTENSION_DIR=modules CONFDIR=conf.d ./dep-tests.sh > dep-tests.log
+PHP=./sapi/cli/php EXTENSION_DIR=modules CONFIG_DIR=conf.d ./dep-tests.sh > dep-tests.log
 if grep -v OK dep-tests.log; then
 	echo >&2 "The results above were not expected"
 	exit 1
@@ -3047,6 +3050,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.857  2010/03/16 10:00:28  glen
+- PHP_5_2:
+  - simplexml requires spl
+  - dep-tests: get the sort order same way php loads (ini files sorting); rel 13
+  - BR: pkgconfig
+
 Revision 1.856  2010/03/16 09:56:56  glen
 - build config fragments in build section (@PHP_5_2)
 
================================================================

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