- better fix

Changed files:
    rpm-build-macros.spec -> 1.247
    rpm.macros -> 1.550

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 61e4aeb318e6d1fa4fc38e9e7492fcf8a083fea3..8374d6654d252f9c5520e7bfed2a379c7fa2d3ea 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.549
+%define                rpm_macros_rev  1.550
 %define                find_lang_rev   1.32
 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 9bc5e8e6d78c695b97f1c0d0504e519450d8892e..8eb7214b4362e683f8151bf2c233487e39f604b7 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -421,7 +421,7 @@ CXXFLAGS="%{rpmcxxflags}" \
 
 # kernel version-release handling
 %__kernel_ver   %{expand:%%global __kernel_ver %( \\
-       Z=$(awk -F'"' '/UTS_RELEASE/{print $2}' %{_kernelsrcdir}/include/linux/{version,utsrelease}.h 2>/dev/null || awk -F'"' '/UTS_RELEASE/{print $2}' %{_kernelsrcdir}/include/{linux/version,generated/utsrelease}.h 2>/dev/null); \\
+       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); \\
        Z=${Z:-$(awk -F' = ' '/^VERSION/{v=$2} /^PATCHLEVEL/{p=$2} /^SUBLEVEL/{s=$2} /^EXTRAVERSION/{e=$2} END {printf("%d.%d.%d%s", v, p, s, e)}' %{_kernelsrcdir}/Makefile 2>/dev/null)}; \\
        echo ${Z:-ERROR}; \\
 )}%__kernel_ver