packages: php/php.spec - PHP_5_2: - sqlite ext has hard dependency on spl...

[glen]

Author: glen                         Date: Tue Mar 16 09:55:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- PHP_5_2:
  - sqlite ext has hard dependency on spl and pdo
  - current wddx does not compile session related code due being built shared
  - filter ext depends on pcre
  - run internal module deps test

---- Files affected:
packages/php:
   php.spec (1.854 -> 1.855) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.854 packages/php/php.spec:1.855
--- packages/php/php.spec:1.854	Tue Mar 16 10:51:41 2010
+++ packages/php/php.spec	Tue Mar 16 10:55:34 2010
@@ -3,6 +3,7 @@
 # - php CLI has safe mode enabled in default config (!!!), recheck default .ini configs?
 #   main php.ini is not loaded at all (at least for cli):
 #   strace -efile php -m 2>&1 | grep /etc/php/php.ini
+# - wddx: restore session support (not compiled in due DL extension check)
 # - deal with modules removed from php and not moved to PECL, still not obsoleted anywhere
 #   - removed from php 5.0 (currently in php4):
 #   db, hyperwave, java, mcal, overload, qtdom
@@ -116,6 +117,7 @@
 Source9:	%{name}_browscap.ini
 Source10:	%{name}-fpm.init
 Source11:	%{name}-fpm.logrotate
+Source13:	dep-tests.sh
 Patch0:		%{name}-shared.patch
 Patch1:		%{name}-pldlogo.patch
 Patch2:		%{name}-mail.patch
@@ -676,6 +678,7 @@
 Group:		Libraries
 URL:		http://www.php.net/manual/en/book.filter.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-pcre = %{epoch}:%{version}-%{release}
 Provides:	php(filter)
 Obsoletes:	php-pecl-filter
 
@@ -1409,8 +1412,8 @@
 Group:		Libraries
 URL:		http://www.php.net/manual/en/book.sqlite.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Suggests:	%{name}-pdo = %{epoch}:%{version}-%{release}
-Suggests:	%{name}-spl = %{epoch}:%{version}-%{release}
+Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
+Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	php(sqlite)
 
 %description sqlite
@@ -1574,7 +1577,10 @@
 Group:		Libraries
 URL:		http://www.php.net/manual/en/book.wddx.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-session = %{epoch}:%{version}-%{release}
+# - wddx doesn't require session as it's disabled at compile time:
+#   if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
+#   see also php.spec#rev1.120.2.22
+#Requires:	%{name}-session = %{epoch}:%{version}-%{release}
 Requires:	%{name}-xml = %{epoch}:%{version}-%{release}
 Provides:	php(wddx)
 
@@ -1797,6 +1803,7 @@
 rm -r ext/xmlrpc/libxmlrpc
 
 cp -af Zend/LICENSE{,.Zend}
+install -p %{SOURCE13} dep-tests.sh
 
 # breaks build
 sed -i -e 's#-fvisibility=hidden##g' configure*
@@ -2027,11 +2034,6 @@
 %{__make} -f Makefile.cgi-fcgi
 [ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -qn)" = cgi-fcgi ] || exit 1
 
-# CLI
-cp -af php_config.h.cli main/php_config.h
-%{__make} -f Makefile.cli
-[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -qn)" = cli ] || exit 1
-
 # PHP FPM
 %if %{with fpm}
 cp -af php_config.h.fpm main/php_config.h
@@ -2039,6 +2041,18 @@
  ./sapi/fpm/php-fpm -qn -m > /dev/null
 %endif
 
+# CLI
+cp -af php_config.h.cli main/php_config.h
+%{__make} -f Makefile.cli
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -qn)" = cli ] || exit 1
+
+# Check that the module inner-dependencies are intact
+PHP=./sapi/cli/php EXTENSION_DIR=modules ./dep-tests.sh > dep-tests.log
+if grep -v OK dep-tests.log; then
+	echo >&2 "The results above were not expected"
+	exit 1
+fi
+
 %if %{with tests}
 # Run tests, using the CLI SAPI
 cp -af php_config.h.cli main/php_config.h
@@ -3028,6 +3042,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.855  2010/03/16 09:55:34  glen
+- PHP_5_2:
+  - sqlite ext has hard dependency on spl and pdo
+  - current wddx does not compile session related code due being built shared
+  - filter ext depends on pcre
+  - run internal module deps test
+
 Revision 1.854  2010/03/16 09:51:41  glen
 -  uid http for fpm (@PHP_5_2)
 
================================================================

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