- _kernel_ver is not what it seems, restored it to previous state, as a

  result restore also _kernel_ver_str
- added description for above macros
- removed now unused __kernel_rel and __kernel_rpmvr macros

diff --git a/rpm.macros b/rpm.macros
index 40979418d51aeb5df7899f4ee17e06bf8484882a..ed0179804f163ea4ecf3ce6454120660c54d809e 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -449,10 +449,10 @@ CXXFLAGS="%{rpmcxxflags}" \
        echo ${Z:-ERROR}; \\
 )
 
-%__kernel_rel  %{__kernel_qf %{R}}
-%__kernel_rpmvr        %{__kernel_qf %{V}-%{R}}
-%_kernel_ver   %{!?_without_dist_kernel:%{__kernel_rpmvr}}%{?_without_dist_kernel:%{__kernel_ver}}
-%_kernel_ver_str %(echo %{_kernel_ver} | tr '-' '_')
+# `uname -r` used for building/installing kernel modules
+%_kernel_ver   %{__kernel_ver}%{!?_without_dist_kernel:%(echo %{__kernel_ver} | grep -q -e - || echo -%{__kernel_qf %{R}})}
+# package version OR `uname -r` for non-dist kernel to be used in @release field
+%_kernel_ver_str %(echo %{!?_without_dist_kernel:%{__kernel_qf %{V}-%{R}}}%{?_without_dist_kernel:%{__kernel_ver}} | tr '-' '_')
 
 # Requires name = version-release
 %requires_releq()      %{!?1:ERROR}%{?2:ERROR}%{?1:%{!?2:%{expand:%%requires_eq_to -r %1 %1}}}