[d-kernel] bootloader-utils-0.3-alt1, memtest86-3.0-alt8

[Alexey Tourbin <at@altlinux.ru>]

[-- Attachment #1.1: Type: text/plain, Size: 705 bytes --]

В /i/S/ уходят:

bootloader-utils-0.3-alt1

* Fri Jun 11 2004 Alexey Tourbin <at@altlinux> 0.3-alt1
- added support for LABEL and UUID volumes (via /etc/mtab)
- installkernel: save entry for /boot/vmlinuz before upgrade
- installkernel: added support for memtest86
- grub: fix for separate /boot partition, by Sergey Vlasov (#4234)
- started test suite (test.pl)

memtest86-3.0-alt8

* Fri Jun 11 2004 Alexey Tourbin <at@altlinux> 3.0-alt8
- use /sbin/installkernel from recent bootloader-utils
  in post/preun scripts; hopefully this should fix #3317


2mike: %_sbindir/installmemtest86 пришлось оставить симлинком, иначе не
отработает старый %preun скрипт.  Полная разница в аттаче.

[-- Attachment #1.2: memtest86.diff --]
[-- Type: text/plain, Size: 2253 bytes --]

--- /home/at/RPM/SPECS/memtest86.spec-	2003-11-26 14:18:43 +0000
+++ /home/at/RPM/SPECS/memtest86.spec	2004-06-11 12:32:46 +0000
@@ -1,27 +1,26 @@
 Name: memtest86
 Version: 3.0
-Release: alt7
+Release: alt8
 
 Summary: Memory test for x86 architecture
 License: GPL
 Group: System/Kernel and hardware
+Packager: Michael Shigorin <mike@altlinux.ru>
 
 Url: http://www.memtest86.com
 Source: %url/%name-%version.tar.bz2
-Source1: memtest86.pm
 Source2: memtest86-3.0-README.rover
 Source3: memtest86-3.0-rover-tested_cpus.tar.gz
 Patch: memtest86-3.0-rover-centrino+c3+amd.patch
 
 ExclusiveArch: %ix86
 
-PreReq: bootloader-utils
+Requires(post,preun): bootloader-utils >= 0.3
 
 # Automatically added by buildreq on Wed Nov 26 2003
 BuildRequires: cpp2.95 gcc2.95
 
 BuildRequires: dev86
-BuildRequires: bootloader-utils
 
 Summary(ru_RU.KOI8-R): фЕУФ РБНСФЙ ДМС x86-БТИЙФЕЛФХТЩ
 Summary(uk_UA.KOI8-U): фЕУФ РБН'СФ¦ ДМС x86-БТИ¦ФЕЛФХТЙ
@@ -70,27 +69,29 @@ Memtest86 -- ТЕФЕМШОЙК ФБ УБНПУФ¦КОЙК ФЕ
 
 %install
 %__install -m644 -pD memtest.bin %buildroot/boot/memtest-%version.bin
-%__install -m755 -pD %SOURCE1 %buildroot%_sbindir/installmemtest86
+%__mkdir -p %buildroot%_sbindir
+%__ln_s `relative /sbin/installkernel %_sbindir/installmemtest86` \
+	%buildroot%_sbindir/installmemtest86
 %__install -m644 -pD %SOURCE2 README.rover
 %__mkdir cpus/
 %__tar -C cpus -zxf %SOURCE3
 
 %post
-%_sbindir/installmemtest86 %version ||:
+%_sbindir/installmemtest86 %version
 
 %preun
-%_sbindir/installmemtest86 -r %version ||:
+%_sbindir/installmemtest86 --remove %version
 
 %files
 /boot/memtest-%version.bin
 %_sbindir/installmemtest86
 %doc README* cpus/
 
-# TODO: detectloader/installmemtest86 are somewhat broken at the time
-# (bootloader misdetection, common problem w/kernel, shouldn't be called
-# at install-time) (also #3317)
-
 %changelog
+* Fri Jun 11 2004 Alexey Tourbin <at@altlinux.ru> 3.0-alt8
+- use /sbin/installkernel from recent bootloader-utils
+  in post/preun scripts; hopefully this should fix #3317
+
 * Wed Nov 26 2003 Michael Shigorin <mike@altlinux.ru> 3.0-alt7
 - removed dependency on initscripts;
   thanks Nick Fedchik <nick fedchik org ua> for noticing

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]