SOURCES (AC-branch): rpm.macros, rpm.macros - include php major ve...

[glen]

Author: glen                         Date: Fri Oct 28 11:53:09 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- include php major version into debug and thread-safety macro

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.74 -> 1.158.4.75) 
SOURCES:
   rpm.macros (1.252 -> 1.253) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.74 SOURCES/rpm.macros:1.158.4.75
--- SOURCES/rpm.macros:1.158.4.74	Fri Oct 28 11:45:20 2005
+++ SOURCES/rpm.macros	Fri Oct 28 13:53:04 2005
@@ -478,6 +478,7 @@
 
 # directory where php includes are installed on system.
 %__php_includedir		/usr/include/php
+%php_major_version		%(awk '/#define PHP_MAJOR_VERSION/{print $3}' %{__php_includedir}/main/php_version.h 2>/dev/null || echo ERROR)
 %php_api_version		%(awk '/#define PHP_API_VERSION/{print $3}' %{__php_includedir}/main/php.h 2>/dev/null || echo ERROR)
 %php_debug				%(awk '/#define ZEND_DEBUG/{print $3}' %{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
 %zend_module_api		%(awk '/#define ZEND_MODULE_API_NO/{print $3}' %{__php_includedir}/Zend/zend_modules.h 2>/dev/null || echo ERROR)
@@ -490,14 +491,14 @@
 # macros for public use
 # for php extensions (php-pecl)
 %requires_php_extension %{__php_api_requires modules_api php_api_version} \
-%{__php_api_requires debug php_debug} \
-%{__php_api_requires thread-safety zend_zts}
+%{__php_api_requires debug:%php_major_version php_debug} \
+%{__php_api_requires thread-safety:%php_major_version zend_zts}
 
 # for zend extensions
 %requires_zend_extension %{__php_api_requires zend_module_api} \
 %{__php_api_requires zend_extension_api} \
-%{__php_api_requires debug php_debug} \
-%{__php_api_requires thread-safety zend_zts}
+%{__php_api_requires debug:%php_major_version php_debug} \
+%{__php_api_requires thread-safety:%php_major_version zend_zts}
 
 # Python specific macro definitions.
 # python main version

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.252 SOURCES/rpm.macros:1.253
--- SOURCES/rpm.macros:1.252	Fri Oct 28 11:45:20 2005
+++ SOURCES/rpm.macros	Fri Oct 28 13:53:04 2005
@@ -479,6 +479,7 @@
 
 # directory where php includes are installed on system.
 %__php_includedir		/usr/include/php
+%php_major_version		%(awk '/#define PHP_MAJOR_VERSION/{print $3}' %{__php_includedir}/main/php_version.h 2>/dev/null || echo ERROR)
 %php_api_version		%(awk '/#define PHP_API_VERSION/{print $3}' %{__php_includedir}/main/php.h 2>/dev/null || echo ERROR)
 %php_debug				%(awk '/#define ZEND_DEBUG/{print $3}' %{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
 %zend_module_api		%(awk '/#define ZEND_MODULE_API_NO/{print $3}' %{__php_includedir}/Zend/zend_modules.h 2>/dev/null || echo ERROR)
@@ -491,14 +492,14 @@
 # macros for public use
 # for php extensions (php-pecl)
 %requires_php_extension %{__php_api_requires modules_api php_api_version} \
-%{__php_api_requires debug php_debug} \
-%{__php_api_requires thread-safety zend_zts}
+%{__php_api_requires debug:%php_major_version php_debug} \
+%{__php_api_requires thread-safety:%php_major_version zend_zts}
 
 # for zend extensions
 %requires_zend_extension %{__php_api_requires zend_module_api} \
 %{__php_api_requires zend_extension_api} \
-%{__php_api_requires debug php_debug} \
-%{__php_api_requires thread-safety zend_zts}
+%{__php_api_requires debug:%php_major_version php_debug} \
+%{__php_api_requires thread-safety:%php_major_version zend_zts}
 
 # Python specific macro definitions.
 # python main version
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.74&r2=1.158.4.75&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.252&r2=1.253&f=u