[packages/rpm-build-macros] v1.655: php_suffix detects itself from current php-devel package

[glen]

commit 2fb1b7ce51401aa70ffe61eba116bc083e5070f4
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jan 24 12:14:17 2013 +0200

    v1.655: php_suffix detects itself from current php-devel package

 rpm-build-macros.spec | 6 +++---
 rpm.macros            | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index fe9c54a..0487348 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,10 +1,10 @@
-%define		rpm_macros_rev	1.654
+%define		rpm_macros_rev	1.655
 %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
 Name:		rpm-build-macros
 Version:	%{rpm_macros_rev}
-Release:	2
+Release:	1
 License:	GPL
 Group:		Development/Building
 Source0:	rpm.macros
@@ -56,7 +56,7 @@ cp -p %{SOURCE1} .
 %endif
 
 %build
-%{__sed} -i -e 's,\$Revision\$,%{rpm_macros_rev},' rpm.macros
+%{__sed} -i -e 's,{Revision},%{rpm_macros_rev},' rpm.macros
 
 rev=$(awk '/^%%rpm_build_macros/{print $2}' rpm.macros)
 if [ "$rev" != "%rpm_macros_rev" ]; then
diff --git a/rpm.macros b/rpm.macros
index 5a9c6d2..d45501c 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -4,7 +4,7 @@
 # <http://www.pld-linux.org/>
 
 # can be used by builder script to check for version
-%rpm_build_macros	$Revision$
+%rpm_build_macros	{Revision}
 
 %epoch		0
 %x8664		x86_64 amd64 ia32e
@@ -918,7 +918,8 @@ fi; \
 # name of php package
 %php_name				php%{?php_suffix}
 # use rpmbuild -D 'php_suffix 54' to build php extension for php 5.4
-%php_suffix				%{nil}
+# 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})
 
 # helper macro
 %__php_api_requires(v:) Requires: %{php_name}(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/2fb1b7ce51401aa70ffe61eba116bc083e5070f4