[packages/rpm-build-macros] - drop non-dist kernel support, it was broken for a long time and noone noticed/cared

baggins baggins at pld-linux.org
Sun Dec 14 13:25:09 CET 2014


commit 8aed58109f1c868351c0f17f4574d682e3e6fd11
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Dec 14 13:24:19 2014 +0100

    - drop non-dist kernel support, it was broken for a long time and noone noticed/cared

 rpm-build-macros.spec | 2 +-
 rpm.macros.kernel     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 63862e9..1a84a33 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.701
+%define		rpm_macros_rev	1.702
 %define		find_lang_rev	1.36
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros.kernel b/rpm.macros.kernel
index 5c3d664..ca160fa 100644
--- a/rpm.macros.kernel
+++ b/rpm.macros.kernel
@@ -85,9 +85,9 @@ done)
 %_kernel_version_magic()	 %(echo $((%{1} * 65536 + %{2} * 256 + %{3})))
 
 # `uname -r` used for building/installing kernel modules
-%_kernel_ver		%{!?_without_dist_kernel:%{__kernel_qf %{V}-%{R}}}%{?_without_dist_kernel:%{__kernel_ver}}
-# 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 '-' '_')
+%_kernel_ver		%{__kernel_qf %{V}-%{R}}
+# package version to be used in @release field
+%_kernel_ver_str	%(echo %{__kernel_qf %{V}-%{R}} | tr '-' '_')
 
 #-----------------------------------------------------------------
 # Find and gzip all kernel modules
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list