- 1.679

- added macros that mimic the behaviour of linux/version.h

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 15a1b1a1b974af9b2c8f6736aa35115e3708c4c5..cdd00f8e21d1973d89b3005cc6c5e027fc38b762 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -5,7 +5,7 @@
 %if "%{pld_release}" == "ac"
 %define        with_rpm4       1
 %endif
-%define                rpm_macros_rev  1.678
+%define                rpm_macros_rev  1.679
 %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 b/rpm.macros
index ed0179804f163ea4ecf3ce6454120660c54d809e..97466e30a895bc4e2b62dac9700aa31b1c841430 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -449,6 +449,13 @@ CXXFLAGS="%{rpmcxxflags}" \
        echo ${Z:-ERROR}; \\
 )
 
+%_kernel_version_code   %( \\
+       Z=$(awk '/LINUX_VERSION_CODE/{print $3}' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null); \\
+       echo ${Z:-ERROR}; \\
+)
+
+%_kernel_version_magic()        %(echo $((%{1} * 65536 + %{2} * 256 + %{3})))
+
 # `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