Accepting request 892581 from home:olh:branches:Base:System

- Use _binary_payload w1.gzdio to make sure this firmware package
  can be installed by rpm binares that lack support for the latest
  compression trends
- Use update-bootloader-rpm-macros

OBS-URL: https://build.opensuse.org/request/show/892581
OBS-URL: https://build.opensuse.org/package/show/Base:System/memtest86+?expand=0&rev=38
This commit is contained in:
Thomas Renninger 2021-05-18 12:54:10 +00:00 committed by Git OBS Bridge
parent 3f9007c7d7
commit c21d6825d2
2 changed files with 14 additions and 9 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed May 12 12:34:56 UTC 2021 - olaf@aepfle.de
- Use _binary_payload w1.gzdio to make sure this firmware package
can be installed by rpm binares that lack support for the latest
compression trends
- Use update-bootloader-rpm-macros
-------------------------------------------------------------------
Tue Apr 27 06:57:21 UTC 2021 - Josef Möllers <josef.moellers@suse.com>

View File

@ -28,8 +28,6 @@ Patch0: fix-destdir
Patch1: memtest86+-5.01-no-optimization.patch
Patch2: memtest86+-5.31b-discard-note_gnu_property.patch
#!BuildIgnore: gcc-PIE
Requires(pre): /sbin/update-bootloader
Requires(pre): perl
Provides: lilo:/boot/memtest.bin
Obsoletes: memtest86 <= 3.2
Provides: memtest86 > 3.2
@ -37,6 +35,9 @@ ExclusiveArch: %{ix86} x86_64
%ifarch x86_64
BuildRequires: glibc-devel-32bit
%endif
%define _binary_payload w1.gzdio
BuildRequires: update-bootloader-rpm-macros
%{?update_bootloader_requires}
%description
Memtest86 is an image that can be booted instead of a real OS. Once booted,
@ -57,14 +58,10 @@ install -Dpm 0644 memtest.bin \
%{buildroot}/boot/memtest.bin
%post
if [ "$YAST_IS_RUNNING" != instsys -a $1 = 1 -a \
-x /sbin/update-bootloader ]; then
/sbin/update-bootloader --add --image /boot/memtest.bin --name "Memory Test (memtest86+)"
fi
true
%update_bootloader_check_type_refresh_post grub2
%postun
test -x /sbin/update-bootloader && /sbin/update-bootloader --remove --force --image /boot/memtest.bin || true
%posttrans
%update_bootloader_posttrans
%files
/boot/memtest.bin