v1.666: __php macro would be version that php headers are installed for (php*-devel)

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 3f37d3fc06f1da26c94aa0aafa80367dc3ecfe91..8175d7306c0fd936acf23be517369d97a5846026 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -5,7 +5,7 @@
 %if "%{pld_release}" == "ac"
 %define        with_rpm4       1
 %endif
-%define                rpm_macros_rev  1.665
+%define                rpm_macros_rev  1.666
 %define                find_lang_rev   1.36
 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 e435d6d3e222fb33813a579d8d8685a74b2a2ace..f76e1335b94dc05dc94a1f04ea932b9d2f8bacb0 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -948,6 +948,9 @@ fi; \
 # NOTE: error output must be empty. otherwise can't build pecl packages if no php*-devel is installed
 %php_suffix             %(c=$(php-config --sysconfdir 2>/dev/null) || echo '' && echo ${c#/etc/php})
 
+# php cli. version that php headers are installed for
+%__php                                 /usr/bin/%{php_name}
+
 # helper macro
 %__php_api_requires(v:) Requires: %{php_name}(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}