]> git.pld-linux.org Git - packages/rpm-build-macros.git/commitdiff
- fix generated/utsrelease.h parsing auto/th/rpm-build-macros-1_549-1
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Sat, 13 Mar 2010 22:21:10 +0000 (22:21 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    rpm-build-macros.spec -> 1.246
    rpm.macros -> 1.549

rpm-build-macros.spec
rpm.macros

index 223e73d089aff2ee216e2f3c4d1676442220101d..61e4aeb318e6d1fa4fc38e9e7492fcf8a083fea3 100644 (file)
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.548
+%define                rpm_macros_rev  1.549
 %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
index 1884313fe24c33170ec27799f8b6250c14bba0f3..9bc5e8e6d78c695b97f1c0d0504e519450d8892e 100644 (file)
@@ -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); \\
+       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=${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
This page took 0.060834 seconds and 4 git commands to generate.