From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 30 Aug 2010 16:01:41 +0000 (+0000)
Subject: - fix requires_{zend|php}_extension zts
X-Git-Tag: auto/ac/rpm-build-macros-1_579-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-build-macros.git;a=commitdiff_plain;h=e2bc6159bc53a0bfb6946fcae0bfed061fee5efd

- fix requires_{zend|php}_extension zts

Changed files:
    rpm-build-macros.spec -> 1.271
    rpm.macros -> 1.579
---

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 6912566..526c969 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.578
+%define		rpm_macros_rev	1.579
 %define		find_lang_rev	1.32
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index 14f9d88..71f5b9d 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -828,13 +828,13 @@ fi; \
 %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 -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 -v %php_major_version debug php_debug} \
-%{__php_api_requires -v %php_major_version thread-safety zend_zts}
+%{__php_api_requires -v %php_major_version thread-safety _zend_zts}
 
 # for php pdo modules (php-pecl-PDO_*)
 %requires_php_pdo_module %{__php_api_requires PDO_API php_pdo_api_version}