Author: glen Date: Wed Nov 2 22:41:21 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- removed duplicate php/zend macros
---- Files affected:
SOURCES:
rpm.macros (1.257 -> 1.258)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.257 SOURCES/rpm.macros:1.258
--- SOURCES/rpm.macros:1.257 Wed Nov 2 23:37:35 2005
+++ SOURCES/rpm.macros Wed Nov 2 23:41:16 2005
@@ -411,13 +411,9 @@
%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)
-
# directory where php includes are installed on system.
%__php_includedir /usr/include/php
+# extract php/zend api versions
%php_major_version %(awk '/#define PHP_MAJOR_VERSION/{print $3}'
%{__php_includedir}/main/php_version.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)
%php_debug %(awk '/#define ZEND_DEBUG/{print $3}'
%{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.257&r2=1.258&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
