[packages/rpm-build-macros] - cleanup and simplify _kernel_ver and _kernel_ver_str macros - removed _kernel_vermagic macro as it

[baggins]

commit 98af4b4489e876be9d03951534e0cb75cea3f251
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Oct 22 12:08:12 2013 +0200

    - cleanup and simplify _kernel_ver and _kernel_ver_str macros
    - removed _kernel_vermagic macro as it's unused duplicate of _kernel_ver_str

 rpm.macros | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/rpm.macros b/rpm.macros
index 42c7d71..c9eda99 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -451,11 +451,8 @@ CXXFLAGS="%{rpmcxxflags}" \
 
 %__kernel_rel	%{__kernel_qf %{R}}
 %__kernel_rpmvr	%{__kernel_qf %{V}-%{R}}
-%_kernel_ver	%{__kernel_ver}%{?with_dist_kernel:%(echo %{__kernel_ver} | grep -q -e - || echo -%{__kernel_rel})}
-%_kernel_ver_str %(echo %{!?_without_dist_kernel:%{__kernel_rpmvr}}%{?_without_dist_kernel:%{__kernel_ver}} | sed -e 's/-/_/g')
-
-# `uname -r` to be used in @release field
-%_kernel_vermagic	%(echo %{_kernel_ver} | sed -e 's/-/_/g')
+%_kernel_ver	%{!?_without_dist_kernel:%{__kernel_rpmvr}}%{?_without_dist_kernel:%{__kernel_ver}}
+%_kernel_ver_str %(echo %{_kernel_ver} | tr '-' '_')
 
 # Requires name = version-release
 %requires_releq()	%{!?1:ERROR}%{?2:ERROR}%{?1:%{!?2:%{expand:%%requires_eq_to -r %1 %1}}}
================================================================

---- gitweb:

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