SOURCES (AC-branch): rpm.macros, rpm.macros - nicer php provide name

[glen]

Author: glen                         Date: Fri Oct 28 20:40:09 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- nicer php provide name

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.75 -> 1.158.4.76) 
SOURCES:
   rpm.macros (1.253 -> 1.254) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.75 SOURCES/rpm.macros:1.158.4.76
--- SOURCES/rpm.macros:1.158.4.75	Fri Oct 28 13:53:04 2005
+++ SOURCES/rpm.macros	Fri Oct 28 22:40:04 2005
@@ -486,19 +486,19 @@
 %zend_zts				%(Z=$(grep -sc '^#define ZTS 1' %{__php_includedir}/main/php_config.h); echo ${Z:-ERROR})
 
 # helper macro
-%__php_api_requires() Requires: php(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}
+%__php_api_requires(v:) Requires: php%{-v*}(%{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} \
-%{__php_api_requires debug:%php_major_version php_debug} \
-%{__php_api_requires thread-safety:%php_major_version zend_zts}
+%{__php_api_requires -v %php_major_version debug php_debug} \
+%{__php_api_requires -v %php_major_version 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 debug:%php_major_version php_debug} \
-%{__php_api_requires thread-safety:%php_major_version zend_zts}
+%{__php_api_requires -v %php_major_version debug php_debug} \
+%{__php_api_requires -v %php_major_version thread-safety zend_zts}
 
 # Python specific macro definitions.
 # python main version

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.253 SOURCES/rpm.macros:1.254
--- SOURCES/rpm.macros:1.253	Fri Oct 28 13:53:04 2005
+++ SOURCES/rpm.macros	Fri Oct 28 22:40:04 2005
@@ -487,19 +487,19 @@
 %zend_zts				%(Z=$(grep -sc '^#define ZTS 1' %{__php_includedir}/main/php_config.h); echo ${Z:-ERROR})
 
 # helper macro
-%__php_api_requires() Requires: php(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}
+%__php_api_requires(v:) Requires: php%{-v*}(%{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} \
-%{__php_api_requires debug:%php_major_version php_debug} \
-%{__php_api_requires thread-safety:%php_major_version zend_zts}
+%{__php_api_requires -v %php_major_version debug php_debug} \
+%{__php_api_requires -v %php_major_version 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 debug:%php_major_version php_debug} \
-%{__php_api_requires thread-safety:%php_major_version zend_zts}
+%{__php_api_requires -v %php_major_version debug php_debug} \
+%{__php_api_requires -v %php_major_version 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.75&r2=1.158.4.76&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.253&r2=1.254&f=u