[packages/rpm-build-macros] - use UTS_RELEASE for determining kernel version, rpm EVR doesn't contain alt_kernel information

[baggins]

commit e36bf11141d4bafefa2dbfd2f0fc177be05bce14
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Feb 1 12:12:28 2015 +0100

    - use UTS_RELEASE for determining kernel version, rpm EVR doesn't contain alt_kernel information

 rpm-build-macros.spec |  4 ++--
 rpm.macros.kernel     | 21 ++++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index d5871c6..7def7e0 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,10 +1,10 @@
-%define		rpm_macros_rev	1.707
+%define		rpm_macros_rev	1.708
 %define		find_lang_rev	1.37
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
 Name:		rpm-build-macros
 Version:	%{rpm_macros_rev}
-Release:	2
+Release:	1
 License:	GPL
 Group:		Development/Building
 Source0:	rpm.macros
diff --git a/rpm.macros.kernel b/rpm.macros.kernel
index 0a3d27b..2fb7c9f 100644
--- a/rpm.macros.kernel
+++ b/rpm.macros.kernel
@@ -68,8 +68,8 @@ done)
 %requires_releq_kernel_up(s:n:)		Requires%{-s:(%{-s*})}: %releq_kernel_up
 %requires_releq_kernel_smp(s:n:)	Requires%{-s:(%{-s*})}: %releq_kernel_smp
 
-# kernel version-release handling
-%__kernel_ver	 %( \\
+# kernel version-release handling, `uname -r` used for building/installing kernel modules
+%_kernel_ver	 %( \\
 	Z=$([ -f '%{_kernelsrcdir}/include/generated/utsrelease.h' ] && \\
 		awk -F'"' '/UTS_RELEASE/{print $2}' %{_kernelsrcdir}/include/{linux/version,generated/utsrelease}.h 2>/dev/null || \\
 		awk -F'"' '/UTS_RELEASE/{print $2}' %{_kernelsrcdir}/include/linux/{version,utsrelease}.h 2>/dev/null); \\
@@ -77,6 +77,18 @@ done)
 		%{_kernelsrcdir}/Makefile 2>/dev/null)}; \\
 	echo ${Z:-ERROR}; \\
 )
+# left for compatibility
+%__kernel_ver		%{_kernel_ver}
+
+# package version to be used in @release field
+%_kernel_ver_str	 %( \\
+	Z=$([ -f '%{_kernelsrcdir}/include/generated/utsrelease.h' ] && \\
+		awk -F'"' '/UTS_RELEASE/{gsub(/-/,"_",$2); print $2}' %{_kernelsrcdir}/include/{linux/version,generated/utsrelease}.h 2>/dev/null || \\
+		awk -F'"' '/UTS_RELEASE/{gsub(/-/,"_",$2); print $2}' %{_kernelsrcdir}/include/linux/{version,utsrelease}.h 2>/dev/null); \\
+	Z=${Z:-$(awk -F' = ' '/^VERSION/{v=$2} /^PATCHLEVEL/{p=$2} /^SUBLEVEL/{s=$2} /^EXTRAVERSION/{e=$2} END {z=sprintf("%d.%d.%d%s", v, p, s, e); gsub(/-/,"_",z); print z}' \\
+		%{_kernelsrcdir}/Makefile 2>/dev/null)}; \\
+	echo ${Z:-ERROR}; \\
+)
 
 %_kernel_version_code	 %( \\
 	Z=$(awk '/LINUX_VERSION_CODE/{print $3}' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null); \\
@@ -85,11 +97,6 @@ done)
 
 %_kernel_version_magic()	 %(echo $((%{1} * 65536 + %{2} * 256 + %{3})))
 
-# `uname -r` used for building/installing kernel modules
-%_kernel_ver		%{__kernel_qf %{V}-%{R}}
-# package version to be used in @release field
-%_kernel_ver_str	%(echo %{__kernel_qf %{V}-%{R}} | tr '-' '_')
-
 %_host_base_arch	%{expand:%%global _host_base_arch %(echo %{_host_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/x32/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_host_base_arch
 %_target_base_arch	%{expand:%%global _target_base_arch %(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/x32/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_target_base_arch
 
================================================================

---- gitweb:

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