[packages/rpm-build-macros] - _kernel_ver is not what it seems, restored it to previous state, as a result restore also _kerne

baggins baggins at pld-linux.org
Thu Oct 24 16:51:03 CEST 2013


commit 1a2c9fbff5c0c63c61336f0bc817154b2594d740
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Oct 24 16:47:49 2013 +0200

    - _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

 rpm.macros | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/rpm.macros b/rpm.macros
index 4097941..ed01798 100644
--- 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}}}
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list