From ba6a48ab2796216ce674769d70bac2b0f6a8e18d9df47b2f05b80a89b7c73cdf Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <snwint@suse.com>
Date: Mon, 3 Jul 2023 12:41:09 +0000
Subject: [PATCH] - release 1.6

OBS-URL: https://build.opensuse.org/package/show/Base:System/perl-Bootloader?expand=0&rev=286
---
 perl-Bootloader-1.5.tar.xz | 3 ---
 perl-Bootloader-1.6.tar.xz | 3 +++
 perl-Bootloader.changes    | 7 +++++++
 perl-Bootloader.spec       | 5 ++++-
 4 files changed, 14 insertions(+), 4 deletions(-)
 delete mode 100644 perl-Bootloader-1.5.tar.xz
 create mode 100644 perl-Bootloader-1.6.tar.xz

diff --git a/perl-Bootloader-1.5.tar.xz b/perl-Bootloader-1.5.tar.xz
deleted file mode 100644
index c212724..0000000
--- a/perl-Bootloader-1.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d759711073aca9ee4a21681e1ac17c28f5e4bea76aa5762b4153d5cfcbb4d317
-size 169792
diff --git a/perl-Bootloader-1.6.tar.xz b/perl-Bootloader-1.6.tar.xz
new file mode 100644
index 0000000..1225875
--- /dev/null
+++ b/perl-Bootloader-1.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c798638f216b3e13c9f3152f99a1f6e5cee4556952a67d2c08c367c2251648a
+size 169816
diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes
index 418db73..417ee8e 100644
--- a/perl-Bootloader.changes
+++ b/perl-Bootloader.changes
@@ -1,3 +1,10 @@
+--------------------------------------------------------------------
+Mon Jul 3 12:40:36 UTC 2023 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/perl-bootloader#154
+- move kexec-bootloader from kexec-tools to perl-Bootloader
+- 1.6
+
 --------------------------------------------------------------------
 Wed Jun 28 13:58:27 UTC 2023 - wfeldt@opensuse.org
 
diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec
index 2b47ac8..226f585 100644
--- a/perl-Bootloader.spec
+++ b/perl-Bootloader.spec
@@ -25,11 +25,12 @@
 %{!?_distconfdir:%global _distconfdir /etc}
 
 Name:           perl-Bootloader
-Version:        1.5
+Version:        1.6
 Release:        0
 Requires:       coreutils
 Requires:       perl-base = %{perl_version}
 Obsoletes:      perl-Bootloader-YAML < %{version}
+Conflicts:      kexec-tools < 2.0.26.0
 Summary:        Tool for boot loader configuration
 License:        GPL-2.0-or-later
 Group:          System/Boot
@@ -54,6 +55,7 @@ make doc
 install -D -m 644 pbl.8 %{buildroot}%{_mandir}/man8/pbl.8
 install -D -m 644 bootloader_entry.8 %{buildroot}%{_mandir}/man8/bootloader_entry.8
 install -D -m 644 update-bootloader.8 %{buildroot}%{_mandir}/man8/update-bootloader.8
+install -D -m 644 kexec-bootloader.8 %{buildroot}%{_mandir}/man8/kexec-bootloader.8
 mkdir -p %{buildroot}/var/log
 touch %{buildroot}/var/log/pbl.log
 
@@ -68,6 +70,7 @@ chmod 600 /var/log/pbl.log
 %doc boot.readme
 %{sbindir}/update-bootloader
 %{sbindir}/pbl
+%{sbindir}/kexec-bootloader
 /usr/lib/bootloader
 %if "%{_distconfdir}" == "/etc"
 %config(noreplace) %{_distconfdir}/logrotate.d/pbl