SPECS: php.spec - chasing the bug

[glen]

Author: glen                         Date: Thu Sep 15 23:55:30 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- chasing the bug

---- Files affected:
SPECS:
   php.spec (1.479 -> 1.480) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.479 SPECS/php.spec:1.480
--- SPECS/php.spec:1.479	Fri Sep 16 01:41:22 2005
+++ SPECS/php.spec	Fri Sep 16 01:55:24 2005
@@ -210,6 +210,11 @@
 # redefine to use versions from current source
 %define		__php_includedir %{_builddir}/%{name}-%{version}
 
+# temporarily
+%define	php_api_version		%(awk '/#define PHP_API_VERSION/{print $3}' %{__php_includedir}/main/php.h || echo ERROR)
+%define	zend_module_api		%(awk '/#define ZEND_MODULE_API_NO/{print $3}' %{__php_includedir}/Zend/zend_modules.h || echo ERROR)
+%define	zend_extension_api		%(awk '/#define ZEND_EXTENSION_API_NO/{print $3}' %{__php_includedir}/Zend/zend_extensions.h || echo ERROR)
+
 %description
 PHP is an HTML-embedded scripting language. PHP attempts to make it
 easy for developers to write dynamically generated web pages. PHP also
@@ -1692,6 +1697,19 @@
 %{__make} sapi/cli/php -f Makefile.cli
 
 %install
+# sanity check
+cat >&2 <<EOF
+
+	MODULES_API = %{php_api_version}
+	ZEND_MODULE_API = %{zend_module_api}
+	ZEND_EXTENSION_API = %{zend_extension_api}
+
+EOF
+%if "%{php_api_version}" == "ERROR" || "%{zend_module_api}" == "ERROR" || "%{zend_extension_api}" == "ERROR"
+	echo "INTERNAL ERROR: API versions broken!"
+	exit 1
+%endif
+
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi},%{_phpsharedir}} \
 	$RPM_BUILD_ROOT/home/services/{httpd,apache}/icons \
@@ -2477,8 +2495,6 @@
 %triggerun zlib -- %{name}-zlib < 4:5.0.4-9.1
 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove zlib %{_sysconfdir}/php.ini
 
-#%files
-
 %if %{with apache1}
 %files -n apache1-mod_php
 %defattr(644,root,root,755)
@@ -2521,12 +2537,6 @@
 %doc LICENSE Zend/LICENSE.Zend EXTENSIONS NEWS TODO*
 %doc README.EXT_SKEL README.SELF-CONTAINED-EXTENSIONS
 
-%if "%{php_api_version}" == "ERROR" || "%{zend_module_api}" == "ERROR" || "%{zend_extension_api}" == "ERROR"
-INTERNAL ERROR: API versions broken:
-	php(modules_api) = %{php_api_version}
-	php(zend_module_api) = %{zend_module_api}
-	php(zend_extension_api) = %{zend_extension_api}
-%endif
 %dir %{_sysconfdir}
 %dir %{_sysconfdir}/conf.d
 %attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php.ini
@@ -2928,6 +2938,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.480  2005/09/15 23:55:24  glen
+- chasing the bug
+
 Revision 1.479  2005/09/15 23:41:22  glen
 - add debug on php_api_version and error check (as DEVEL is occupied using HEAD). rel 6
 
================================================================

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