[packages/rpm-build-macros] - reuse existing macro

[baggins]

commit e1b6d0b60001a6b6dd1292f362e910d10ed58c5f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Oct 20 21:33:22 2013 +0200

    - reuse existing macro

 rpm.macros | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm.macros b/rpm.macros
index 888f425..35b09a8 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -449,8 +449,8 @@ CXXFLAGS="%{rpmcxxflags}" \
 	echo ${Z:-ERROR}; \\
 )}%__kernel_ver
 
-%__kernel_rel	%{expand:%%global __kernel_rel %(Z=$(cd %{_kernelsrcdir} 2>/dev/null && LC_ALL=C rpm -qf include/linux/fs.h 2>/dev/null --qf "%{R}" | grep -v "is not"); echo ${Z:-ERROR})}%__kernel_rel
-%__kernel_rpmvr	%{expand:%%global __kernel_rpmvr %(Z=$(cd %{_kernelsrcdir} 2>/dev/null && LC_ALL=C rpm -qf include/linux/fs.h 2>/dev/null --qf "%{V}-%{R}" | grep -v "is not"); echo ${Z:-ERROR})}%__kernel_rpmvr
+%__kernel_rel	%{expand:%%global __kernel_rel %{__kernel_qf %{R}}}%__kernel_rel
+%__kernel_rpmvr	%{expand:%%global __kernel_rpmvr %{__kernel_qf %{V}-%{R}}}%__kernel_rpmvr
 %_kernel_ver	%{expand:%%global _kernel_ver %{__kernel_ver}%{?with_dist_kernel:%(echo %{__kernel_ver} | grep -q -e - || echo -%{__kernel_rel})}}%_kernel_ver
 %_kernel_ver_str %{expand:%%global _kernel_ver_str %(echo %{!?_without_dist_kernel:%{__kernel_rpmvr}}%{?_without_dist_kernel:%{__kernel_ver}} | sed -e 's/-/_/g')}%_kernel_ver_str
 
================================================================

---- gitweb:

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