From a3a766b1e4a810e566c39d2ba6650abaa17984be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Wed, 16 Oct 2024 09:16:43 +0200
Subject: [PATCH] Sync from SUSE:ALP:Source:Standard:1.0 perl-Bootloader
 revision db8b75a00be1463e90aad03fde25a729

---
 ...-script-can-have-an-optional-force-d.patch | 27 -----------------
 perl-Bootloader-1.6.tar.xz                    |  3 --
 perl-Bootloader-1.8.2.tar.xz                  |  3 ++
 perl-Bootloader.changes                       | 30 +++++++++++++++++++
 perl-Bootloader.spec                          |  6 ++--
 5 files changed, 35 insertions(+), 34 deletions(-)
 delete mode 100644 0001-bootloader_entry-script-can-have-an-optional-force-d.patch
 delete mode 100644 perl-Bootloader-1.6.tar.xz
 create mode 100644 perl-Bootloader-1.8.2.tar.xz

diff --git a/0001-bootloader_entry-script-can-have-an-optional-force-d.patch b/0001-bootloader_entry-script-can-have-an-optional-force-d.patch
deleted file mode 100644
index 4faff6b..0000000
--- a/0001-bootloader_entry-script-can-have-an-optional-force-d.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From eacebfbf81a4bec260341ae02b5cb4e5828a2932 Mon Sep 17 00:00:00 2001
-From: Steffen Winterfeldt <wfeldt@opensuse.org>
-Date: Thu, 7 Sep 2023 10:43:25 +0200
-Subject: [PATCH] bootloader_entry script can have an optional 'force-default'
- argument (bsc#1215064)
-
----
- pbl | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pbl b/pbl
-index 471c92f..570bafa 100755
---- a/pbl
-+++ b/pbl
-@@ -300,7 +300,8 @@ if($program eq 'pbl') {
- }
- 
- if($program eq 'bootloader_entry') {
--  if($ARGV[0] =~ /^(add|remove)$/ && @ARGV == 5) {
-+  # there might be an optional 6th argument 'force-default'
-+  if($ARGV[0] =~ /^(add|remove)$/ && @ARGV >= 5) {
-     push @todo, [ "$ARGV[0]-kernel", @ARGV[2..4] ]
-   }
-   else {
--- 
-2.35.3
-
diff --git a/perl-Bootloader-1.6.tar.xz b/perl-Bootloader-1.6.tar.xz
deleted file mode 100644
index 1c87d3c..0000000
--- a/perl-Bootloader-1.6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c798638f216b3e13c9f3152f99a1f6e5cee4556952a67d2c08c367c2251648a
-size 169816
diff --git a/perl-Bootloader-1.8.2.tar.xz b/perl-Bootloader-1.8.2.tar.xz
new file mode 100644
index 0000000..470b084
--- /dev/null
+++ b/perl-Bootloader-1.8.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:110187f4af04c024672b473e8df1ac8777f89983da57d0dfbae88550f9205d31
+size 170136
diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes
index 252d188..048ee7d 100644
--- a/perl-Bootloader.changes
+++ b/perl-Bootloader.changes
@@ -1,3 +1,33 @@
+--------------------------------------------------------------------
+Mon Sep 23 12:22:16 UTC 2024 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/perl-bootloader#176
+- handle missing grub_installdevice on powerpc (bsc#1230070)
+- 1.8.2
+- removing patch 0001-bootloader_entry-script-can-have-an-optional-force-d.patch
+
+--------------------------------------------------------------------
+Mon Sep 23 12:22:15 UTC 2024 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/perl-bootloader#167
+- log grub2-install errors correctly (bsc#1221470)
+- 1.8.1
+
+--------------------------------------------------------------------
+Mon Sep 23 12:22:14 UTC 2024 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/perl-bootloader#158
+- skip warning about unsupported options when in compat mode
+- 1.8
+
+--------------------------------------------------------------------
+Mon Sep 23 12:22:13 UTC 2024 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/perl-bootloader#156
+- bootloader_entry script can have an optional 'force-default'
+  argument (bsc#1215064)
+- 1.7
+
 -------------------------------------------------------------------
 Mon Sep  9 07:22:17 UTC 2024 - Marcus Meissner <meissner@suse.com>
 
diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec
index 36a839c..824e5d6 100644
--- a/perl-Bootloader.spec
+++ b/perl-Bootloader.spec
@@ -25,9 +25,10 @@
 %{!?_distconfdir:%global _distconfdir /etc}
 
 Name:           perl-Bootloader
-Version:        1.6
+Version:        1.8.2
 Release:        0
 Requires:       coreutils
+Requires:       util-linux
 Requires:       perl-base = %{perl_version}
 Obsoletes:      perl-Bootloader-YAML < %{version}
 Conflicts:      kexec-tools < 2.0.26.0
@@ -36,8 +37,6 @@ License:        GPL-2.0-or-later
 Group:          System/Boot
 URL:            https://github.com/openSUSE/perl-bootloader
 Source:         %{name}-%{version}.tar.xz
-# from git
-Patch0:		0001-bootloader_entry-script-can-have-an-optional-force-d.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  perl
 BuildRequires:  rubygem(asciidoctor)
@@ -48,7 +47,6 @@ Shell script wrapper for configuring various boot loaders.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build