SPECS: php.spec - 5.2.5RC2 - skip php.ini loading in sapi name tes...

[glen]

Author: glen                         Date: Wed Nov  7 22:34:25 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 5.2.5RC2
- skip php.ini loading in sapi name test which would load system extensions whose API version would mismatch

---- Files affected:
SPECS:
   php.spec (1.694 -> 1.695) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.694 SPECS/php.spec:1.695
--- SPECS/php.spec:1.694	Sat Nov  3 16:17:02 2007
+++ SPECS/php.spec	Wed Nov  7 23:34:20 2007
@@ -72,8 +72,8 @@
 %undefine	with_filter
 %endif
 
-%define		_rel 0.4
-%define		_rc RC1
+%define		_rel 0.2
+%define		_rc RC2
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -88,7 +88,7 @@
 Group:		Libraries
 #Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
 Source0:	http://downloads.php.net/ilia/%{name}-%{version}%{_rc}.tar.bz2
-# Source0-md5:	2f0c9ecbd50213958e9b69ec69f715ec
+# Source0-md5:	deb66ac45b18ced1077365b0e0179995
 Source2:	zend.gif
 Source3:	%{name}-mod_%{name}.conf
 Source4:	%{name}-cgi-fcgi.ini
@@ -172,7 +172,7 @@
 BuildRequires:	mysql-devel >= 4.0.0
 %{?with_mysqli:BuildRequires:	mysql-devel >= 4.1.0}
 BuildRequires:	ncurses-ext-devel
-%{?with_ldap:BuildRequires:	openldap-devel >= 2.4.6}
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 %if %{with openssl} || %{with ldap}
 BuildRequires:	openssl-devel >= 0.9.7d
 %endif
@@ -1821,19 +1821,19 @@
 rm -rf sapi/cgi/.libs sapi/cgi/*.lo
 %{__make} sapi/cgi/php-cgi -f Makefile.fcgi
 cp -r sapi/cgi sapi/fcgi
-[ "$(echo '<?=php_sapi_name();' | ./sapi/fcgi/php-cgi -q)" = cgi-fcgi ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/fcgi/php-cgi -qn)" = cgi-fcgi ] || exit 1
 %endif
 
 # CGI
 cp -af php_config.h.cgi main/php_config.h
 rm -rf sapi/cgi/.libs sapi/cgi/*.lo
 %{__make} sapi/cgi/php-cgi -f Makefile.cgi
-[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -q)" = cgi ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -qn)" = cgi ] || exit 1
 
 # CLI
 cp -af php_config.h.cli main/php_config.h
 %{__make} sapi/cli/php -f Makefile.cli
-[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -q)" = cli ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -n)" = cli ] || exit 1
 
 %if %{with tests}
 # Run tests, using the CLI SAPI
@@ -2738,6 +2738,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.695  2007/11/07 22:34:20  glen
+- 5.2.5RC2
+- skip php.ini loading in sapi name test which would load system extensions whose API version would mismatch
+
 Revision 1.694  2007/11/03 15:17:02  baggins
 - rel 0.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.694&r2=1.695&f=u