packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

[glen]

Author: glen                         Date: Mon Aug 30 16:01:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix requires_{zend|php}_extension zts

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.270 -> 1.271) , rpm.macros (1.578 -> 1.579) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.270 packages/rpm-build-macros/rpm-build-macros.spec:1.271
--- packages/rpm-build-macros/rpm-build-macros.spec:1.270	Mon Aug 30 17:39:44 2010
+++ packages/rpm-build-macros/rpm-build-macros.spec	Mon Aug 30 18:01:41 2010
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%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
@@ -90,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.271  2010/08/30 16:01:41  glen
+- fix requires_{zend|php}_extension zts
+
 Revision 1.270  2010/08/30 15:39:44  glen
 - 1.578: make %zend_zts expand to "_ts" or ""
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.578 packages/rpm-build-macros/rpm.macros:1.579
--- packages/rpm-build-macros/rpm.macros:1.578	Mon Aug 30 17:38:57 2010
+++ packages/rpm-build-macros/rpm.macros	Mon Aug 30 18:01:41 2010
@@ -828,13 +828,13 @@
 %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}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.270&r2=1.271&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.578&r2=1.579&f=u