SOURCES (AC-branch): rpm.macros, rpm.macros - need php debug and t...

[glen]

Author: glen                         Date: Thu Oct 27 14:20:01 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- need php debug and thread-safety pair match between php and php modules/extensions

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.69 -> 1.158.4.70) 
SOURCES:
   rpm.macros (1.247 -> 1.248) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.69 SOURCES/rpm.macros:1.158.4.70
--- SOURCES/rpm.macros:1.158.4.69	Sat Oct 22 21:13:44 2005
+++ SOURCES/rpm.macros	Thu Oct 27 16:19:56 2005
@@ -479,18 +479,25 @@
 # directory where php includes are installed on system.
 %__php_includedir		/usr/include/php
 %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)
 %zend_extension_api		%(awk '/#define ZEND_EXTENSION_API_NO/{print $3}' %{__php_includedir}/Zend/zend_extensions.h 2>/dev/null || echo ERROR)
+%zend_zts				%(awk '/#define ZTS/{print $3}' %{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
 
 # helper macro
 %__php_api_requires() Requires: php(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}
 
 # macros for public use
 # for php extensions (php-pecl)
-%requires_php_extension %{__php_api_requires modules_api php_api_version}
+%requires_php_extension %{__php_api_requires modules_api php_api_version} \
+%{__php_api_requires debug php_debug} \
+%{__php_api_requires thread-safety zend_zts}
+
 # for zend extensions
 %requires_zend_extension %{__php_api_requires zend_module_api} \
-%{__php_api_requires zend_extension_api}
+%{__php_api_requires zend_extension_api} \
+%{__php_api_requires debug php_debug} \
+%{__php_api_requires thread-safety zend_zts}
 
 # Python specific macro definitions.
 # python main version

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.247 SOURCES/rpm.macros:1.248
--- SOURCES/rpm.macros:1.247	Sat Oct 22 21:13:44 2005
+++ SOURCES/rpm.macros	Thu Oct 27 16:19:56 2005
@@ -480,18 +480,25 @@
 # directory where php includes are installed on system.
 %__php_includedir		/usr/include/php
 %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)
 %zend_extension_api		%(awk '/#define ZEND_EXTENSION_API_NO/{print $3}' %{__php_includedir}/Zend/zend_extensions.h 2>/dev/null || echo ERROR)
+%zend_zts				%(awk '/#define ZTS/{print $3}' %{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
 
 # helper macro
 %__php_api_requires() Requires: php(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}
 
 # macros for public use
 # for php extensions (php-pecl)
-%requires_php_extension %{__php_api_requires modules_api php_api_version}
+%requires_php_extension %{__php_api_requires modules_api php_api_version} \
+%{__php_api_requires debug php_debug} \
+%{__php_api_requires thread-safety zend_zts}
+
 # for zend extensions
 %requires_zend_extension %{__php_api_requires zend_module_api} \
-%{__php_api_requires zend_extension_api}
+%{__php_api_requires zend_extension_api} \
+%{__php_api_requires debug php_debug} \
+%{__php_api_requires thread-safety zend_zts}
 
 # Python specific macro definitions.
 # python main version
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.69&r2=1.158.4.70&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.247&r2=1.248&f=u