On Tue, Jan 04, 2005 at 09:05:01PM +0000, pluto wrote:
> diff -u SOURCES/rpm.macros:1.184 SOURCES/rpm.macros:1.185
> --- SOURCES/rpm.macros:1.184 Tue Jan 4 19:44:13 2005
> +++ SOURCES/rpm.macros Tue Jan 4 21:04:54 2005
> @@ -229,7 +229,7 @@
> %apache_modules_api %(awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}'
> /usr/include/apache/ap_mmn.h 2>/dev/null || echo ERROR)
>
> # kernel version-release handling
> -%__kernel_rel %(LC_ALL="C" rpm -qf %{_kernelsrcdir}/include/linux/fs.h
> --queryformat "%{VERSION}" | grep -v "is not")
> +%__kernel_ver %(LC_ALL="C" rpm -qf %{_kernelsrcdir}/include/linux/fs.h
> --queryformat "%{VERSION}" | grep -v "is not")
> #__kernel_ver %([ -f %{_kernelsrcdir}/include/linux/version.h ] && (grep
> UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | head -n 1
> | cut -d'"' -f2) || (awk '/^VERSION/ { ver = $0; gsub(/VERSION.*=/, NIL,
> ver); } /^PATCHLEVEL/ { plev = $0; gsub(/PATCHLEVEL.*=/, NIL, plev); }
> /^SUBLEVEL/ { slev = $0; gsub(/SUBLEVEL.*=/, NIL, slev); } /^EXTRAVERSION/ {
> ever = $0; gsub(/EXTRAVERSION.*=/, NIL, ever); gsub(/ /, NIL, ever); } END {
> printf("%d.%d.%d%s", ver, plev, slev, ever); }' %{_kernelsrcdir}/Makefile 2>
> /dev/null))
> %__kernel_rel %(LC_ALL="C" rpm -qf %{_kernelsrcdir}/include/linux/fs.h
> --queryformat "%{RELEASE}" | grep -v "is not")
> %__kernel_rpmvr %(LC_ALL="C" rpm -qf %{_kernelsrcdir}/include/linux/fs.h
> --queryformat "%{VERSION}-%{RELEASE}" | grep -v "is not")
Niedobrze.
1. Nie obsłuży !dist_kernel (kiedy nagłówki nie należą do żadnego pakietu).
2. Nie przewiduje przypadku EXTRAVERSION != %{release}.
Co było źle w poprzedniej wersji?
--
Jakub Bogusz http://cyber.cs.net.pl/~qboosh/
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
