From 99c2b32eff06753ee14b5a14e619f24e36a61e39 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 21 Jun 2013 16:30:47 +0300 Subject: [PATCH] v1.666: __php macro would be version that php headers are installed for (php*-devel) --- rpm-build-macros.spec | 2 +- rpm.macros | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec index 3f37d3f..8175d73 100644 --- 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 e435d6d..f76e133 100644 --- 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}}} -- 2.44.0