[packages/rpm-build-macros] php deps: make php internal deps based on package basename (php, php52, php54)

[glen]

commit a994b98a90888f00a102a0060356882d1bd9fd99
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 2 22:48:21 2012 +0300

    php deps: make php internal deps based on package basename (php, php52, php54)

 rpm.macros | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/rpm.macros b/rpm.macros
index 0792417..4eaf93a 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -903,20 +903,20 @@ fi; \
 %php_suffix				%{nil}
 
 # helper macro
-%__php_api_requires(v:) Requires: php%{-v*}(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}
+%__php_api_requires(v:) Requires: %{php_name}(%{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 zend_module_api} \
-%{__php_api_requires -v %php_major_version debug php_debug} \
-%{__php_api_requires -v %php_major_version thread-safety _zend_zts}
+%{__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 -v %php_major_version debug php_debug} \
-%{__php_api_requires -v %php_major_version thread-safety _zend_zts}
+%{__php_api_requires debug php_debug} \
+%{__php_api_requires thread-safety _zend_zts}
 
 # for php pdo modules (php-pecl-PDO_*)
 %requires_php_pdo_module %{__php_api_requires PDO_API php_pdo_api_version}