SPECS: php.spec - make it parse spec properly if source is not yet...

[glen]

Author: glen                         Date: Tue Sep 13 19:52:30 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- make it parse spec properly if source is not yet unpacked to extract API versions

---- Files affected:
SPECS:
   php.spec (1.473 -> 1.474) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.473 SPECS/php.spec:1.474
--- SPECS/php.spec:1.473	Tue Sep 13 19:55:07 2005
+++ SPECS/php.spec	Tue Sep 13 21:52:24 2005
@@ -78,7 +78,7 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php
 Version:	5.0.5
-Release:	3.1%{?with_hardening:hardened}
+Release:	3.2%{?with_hardening:hardened}
 Epoch:		4
 Group:		Libraries
 License:	PHP
@@ -208,10 +208,11 @@
 %define		extensionsdir	%{_libdir}/php
 
 # redefine to use versions from current source
-%define		php_sourcedir %{_builddir}/%{name}-%{version}
-%define		php_api_version %(awk '/#define PHP_API_VERSION/{print $3}' %{php_sourcedir}/main/php.h)
-%define		zend_module_api %(awk '/#define ZEND_MODULE_API_NO/{print $3}' %{php_sourcedir}/Zend/zend_modules.h)
-%define		zend_extension_api %(awk '/#define ZEND_EXTENSION_API_NO/{print $3}' %{php_sourcedir}/Zend/zend_extensions.h)
+%define		__php_includedir %{_builddir}/%{name}-%{version}
+# these will be moved to rpm.macros later on.
+%define		php_api_version %(awk '/#define PHP_API_VERSION/{print $3}' %{__php_includedir}/main/php.h 2>/dev/null || echo ERROR)
+%define		zend_module_api %(awk '/#define ZEND_MODULE_API_NO/{print $3}' %{__php_includedir}/Zend/zend_modules.h 2>/dev/null || echo ERROR)
+%define		zend_extension_api %(awk '/#define ZEND_EXTENSION_API_NO/{print $3}' %{__php_includedir}/Zend/zend_extensions.h 2>/dev/null || echo ERROR)
 
 %description
 PHP is an HTML-embedded scripting language. PHP attempts to make it
@@ -1442,7 +1443,7 @@
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
-# IMPORTANT: if you change '%setup', you should change %php_sourcedir macro earlier in this file
+# IMPORTANT: if you change '%setup', you should change %__php_includedir macro earlier in this file
 %setup -q
 # this patch is broken by design, breaks --enable-versioning for example
 # update: --enable-version is broken by itself, it disables dynamic modules.
@@ -2921,6 +2922,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.474  2005/09/13 19:52:24  glen
+- make it parse spec properly if source is not yet unpacked to extract API versions
+
 Revision 1.473  2005/09/13 17:55:07  glen
 - add API versions for php-common package (modules_api, zend_module_api, zend_extension_api)
 
================================================================

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