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

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 63862e9dcedced480343812d875bbd2d51394bc0..1a84a33e71ec8e60f874dba5f7a86ef24bb7fb7c 100644 (file)
--- 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 5c3d664f4ff1859766bcb3abbce162ecd617c623..ca160fa9b4fe1e3ac585bbb87323e6d8474a6394 100644 (file)
--- 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