packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

[arekm]

Author: arekm                        Date: Sat Mar 13 22:21:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix generated/utsrelease.h parsing

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.245 -> 1.246) , rpm.macros (1.548 -> 1.549) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.245 packages/rpm-build-macros/rpm-build-macros.spec:1.246
--- packages/rpm-build-macros/rpm-build-macros.spec:1.245	Sun Mar  7 19:06:52 2010
+++ packages/rpm-build-macros/rpm-build-macros.spec	Sat Mar 13 23:21:10 2010
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%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
@@ -90,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.246  2010/03/13 22:21:10  arekm
+- fix generated/utsrelease.h parsing
+
 Revision 1.245  2010/03/07 18:06:52  arekm
 - add include/autoconf.h, too - just in case
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.548 packages/rpm-build-macros/rpm.macros:1.549
--- packages/rpm-build-macros/rpm.macros:1.548	Sun Mar  7 19:06:52 2010
+++ packages/rpm-build-macros/rpm.macros	Sat Mar 13 23:21:10 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); \\
+	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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.245&r2=1.246&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.548&r2=1.549&f=u