Author: arekm Date: Sat Mar 13 22:32:51 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- better fix
---- Files affected:
packages/rpm-build-macros:
rpm-build-macros.spec (1.246 -> 1.247) , rpm.macros (1.549 -> 1.550)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.246
packages/rpm-build-macros/rpm-build-macros.spec:1.247
--- packages/rpm-build-macros/rpm-build-macros.spec:1.246 Sat Mar 13
23:21:10 2010
+++ packages/rpm-build-macros/rpm-build-macros.spec Sat Mar 13 23:32:45 2010
@@ -1,5 +1,5 @@
# $Revision$, $Date$
-%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
@@ -90,6 +90,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.247 2010/03/13 22:32:45 arekm
+- better fix
+
Revision 1.246 2010/03/13 22:21:10 arekm
- fix generated/utsrelease.h parsing
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.549
packages/rpm-build-macros/rpm.macros:1.550
--- packages/rpm-build-macros/rpm.macros:1.549 Sat Mar 13 23:21:10 2010
+++ packages/rpm-build-macros/rpm.macros Sat Mar 13 23:32:46 2010
@@ -421,7 +421,7 @@
# 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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.246&r2=1.247&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.549&r2=1.550&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
