From c21d6825d28e8c75b063c25e3f0a589faee677e74d20c4a7e9ffe613d8f55c12 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Tue, 18 May 2021 12:54:10 +0000
Subject: [PATCH] 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
---
 memtest86+.changes |  8 ++++++++
 memtest86+.spec    | 15 ++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/memtest86+.changes b/memtest86+.changes
index 7959e77..66ad14d 100644
--- a/memtest86+.changes
+++ b/memtest86+.changes
@@ -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>
 
diff --git a/memtest86+.spec b/memtest86+.spec
index df0089c..985fd04 100644
--- a/memtest86+.spec
+++ b/memtest86+.spec
@@ -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