SOURCES (AC-branch): rpm.macros - fix caps (damn vim for losing them)

[glen]

Author: glen                         Date: Tue Sep 13 20:34:30 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- fix caps (damn vim for losing them)

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.59 -> 1.158.4.60) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.59 SOURCES/rpm.macros:1.158.4.60
--- SOURCES/rpm.macros:1.158.4.59	Tue Sep 13 22:16:10 2005
+++ SOURCES/rpm.macros	Tue Sep 13 22:34:25 2005
@@ -471,18 +471,18 @@
 %php_pear_dir	%{_datadir}/pear
 
 # extract php/zend api versions
-%php_api_version %(awk '/#define php_api_version/{print $3}' /usr/include/php/main/php.h)
-%zend_module_api %(awk '/#define zend_module_api_no/{print $3}' /usr/include/php/zend/zend_modules.h)
-%zend_extension_api %(awk '/#define zend_extension_api_no/{print $3}' /usr/include/php/zend/zend_extensions.h)
+%php_api_version %(awk '/#define PHP_API_VERSION/{print $3}' /usr/include/php/main/php.h)
+%zend_module_api %(awk '/#define ZEND_MODULE_API_NO/{print $3}' /usr/include/php/Zend/zend_modules.h)
+%zend_extension_api %(awk '/#define ZEND_EXTENSION_API_NO/{print $3}' /usr/include/php/Zend/zend_extensions.h)
 
 # 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)
-%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)
+%php_api_version		%(awk '/#define PHP_API_VERSION/{print $3}' %{__php_includedir}/main/php.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)
 
 # helper macro
-%__php_api_requires() requires: php(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}
+%__php_api_requires() Requires: php(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}
 
 # macros for public use
 # for php extensions (php-pecl)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.59&r2=1.158.4.60&f=u