- cleanup and simplify _kernel_ver and _kernel_ver_str macros

- removed _kernel_vermagic macro as it's unused duplicate of _kernel_ver_str

diff --git a/rpm.macros b/rpm.macros
index 42c7d71c46d4d199a30ce4f23a3835b2bcaf9132..c9eda993946f396f71f484650a33cc7910c8cdd7 100644 (file)
--- 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}}}