From f9fc0ed74d291fd0c3092a156be50f80814e84dd4d2fc56cb806225daa3bc44c Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Wed, 19 Jul 2023 07:43:48 +0000
Subject: [PATCH] Accepting request 1099409 from devel:microos:systemd-boot

- Update to version 1+git20230717.dac075e:
  * Install default boot loader in non-secure-boot case too

- Update to version 1+git20230713.df6eaca:
  * Update features
  * Call stty only in interactive mode
  * silence stty errors

- Update to version 1+git20230713.356f0c5:
  * Fix rpm dependencies

OBS-URL: https://build.opensuse.org/request/show/1099409
OBS-URL: https://build.opensuse.org/package/show/devel:microos/sdbootutil?expand=0&rev=4
---
 _servicedata                             |  2 +-
 sdbootutil-1+git20230711.f5c7e48.obscpio |  3 ---
 sdbootutil-1+git20230717.dac075e.obscpio |  3 +++
 sdbootutil.changes                       | 20 ++++++++++++++++++++
 sdbootutil.obsinfo                       |  6 +++---
 sdbootutil.spec                          | 10 +++++++---
 6 files changed, 34 insertions(+), 10 deletions(-)
 delete mode 100644 sdbootutil-1+git20230711.f5c7e48.obscpio
 create mode 100644 sdbootutil-1+git20230717.dac075e.obscpio

diff --git a/_servicedata b/_servicedata
index 22a5350..dc58594 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/lnussel/sdbootutil.git</param>
-              <param name="changesrevision">f5c7e48bca77729870773e940df9426ee83c5ae5</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">dac075ef5bdba3304dfb2076ae9f009ffd36ad3c</param></service></servicedata>
\ No newline at end of file
diff --git a/sdbootutil-1+git20230711.f5c7e48.obscpio b/sdbootutil-1+git20230711.f5c7e48.obscpio
deleted file mode 100644
index e513f44..0000000
--- a/sdbootutil-1+git20230711.f5c7e48.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10ba0f22cf74511399c425a064400f3381c29c5fc8a95adfd014434f7568cdd0
-size 322571
diff --git a/sdbootutil-1+git20230717.dac075e.obscpio b/sdbootutil-1+git20230717.dac075e.obscpio
new file mode 100644
index 0000000..fef5d6e
--- /dev/null
+++ b/sdbootutil-1+git20230717.dac075e.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9feec3d3318576d06ffd4c8942f522ec5a231df9050c1e8a51c1da48c43a484f
+size 324107
diff --git a/sdbootutil.changes b/sdbootutil.changes
index 0f69a92..7af7d6f 100644
--- a/sdbootutil.changes
+++ b/sdbootutil.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon Jul 17 09:16:02 UTC 2023 - lnussel@suse.com
+
+- Update to version 1+git20230717.dac075e:
+  * Install default boot loader in non-secure-boot case too
+
+-------------------------------------------------------------------
+Thu Jul 13 12:04:12 UTC 2023 - lnussel@suse.de
+
+- Update to version 1+git20230713.df6eaca:
+  * Update features
+  * Call stty only in interactive mode
+  * silence stty errors
+
+-------------------------------------------------------------------
+Thu Jul 13 08:09:49 UTC 2023 - lnussel@suse.de
+
+- Update to version 1+git20230713.356f0c5:
+  * Fix rpm dependencies
+
 -------------------------------------------------------------------
 Tue Jul 11 11:41:45 UTC 2023 - lnussel@suse.com
 
diff --git a/sdbootutil.obsinfo b/sdbootutil.obsinfo
index 8bde3ba..cb6b7e2 100644
--- a/sdbootutil.obsinfo
+++ b/sdbootutil.obsinfo
@@ -1,4 +1,4 @@
 name: sdbootutil
-version: 1+git20230711.f5c7e48
-mtime: 1689075604
-commit: f5c7e48bca77729870773e940df9426ee83c5ae5
+version: 1+git20230717.dac075e
+mtime: 1689585274
+commit: dac075ef5bdba3304dfb2076ae9f009ffd36ad3c
diff --git a/sdbootutil.spec b/sdbootutil.spec
index ad2ce01..bb0ab44 100644
--- a/sdbootutil.spec
+++ b/sdbootutil.spec
@@ -27,16 +27,16 @@ BuildRequires:  git-core
 %define git_version %{nil}
 %endif
 Name:           sdbootutil
-Version:        1+git20230711.f5c7e48%{git_version}
+Version:        1+git20230717.dac075e%{git_version}
 Release:        0
 Summary:        script to install shim with sd-boot
 License:        MIT
 URL:            https://en.opensuse.org/openSUSE:Usr_merge
 Source:         %{name}-%{version}.tar
-# XXX systemd-boot is in udev
+Requires:       systemd-boot
 Requires:       jq
 Requires:       sed
-Supplements:    (udev and shim)
+Supplements:    (systemd-boot and shim)
 
 %description
 Hook scripts to install shim along with systemd-boot
@@ -62,8 +62,12 @@ Plugin scripts for snapper to handle BLS config files
 
 %package rpm-scriptlets
 Summary:        dummy scriptlets for the kernel
+# make sure to not replace scriptlets with nops on systems that
+# use grub2
+Conflicts:      grub2
 Conflicts:      suse-kernel-rpm-scriptlets
 Provides:       suse-kernel-rpm-scriptlets
+Requires:       %{name}-filetriggers
 
 %description rpm-scriptlets
 Empty scriptlets to satisfy kernel dependencies