From cba1ec9535f293d2c927c0c5ea8c9a1b8cb1e0483ff1299207cf40968402c93b Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Tue, 7 May 2024 13:22:08 +0000
Subject: [PATCH] - Import commit 23b15deb203780580cbfad095ae1071bd2133220  
 23b15deb20 gpt-auto-generator: be more defensive when checking the presence
 of ESP in fstab (bsc#1218671)   7ed2979654 journalctl: explicitly check < 0
 for error   fc5e25d0a0 journalctl: make --until work again with
 --after-cursor and --lines (bsc#1221906)

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1516
---
 systemd-v255.4+suse.22.g56b53b17bc.tar.xz | 3 ---
 systemd-v255.4+suse.25.g23b15deb20.tar.xz | 3 +++
 systemd.changes                           | 9 +++++++++
 systemd.spec                              | 6 +++---
 4 files changed, 15 insertions(+), 6 deletions(-)
 delete mode 100644 systemd-v255.4+suse.22.g56b53b17bc.tar.xz
 create mode 100644 systemd-v255.4+suse.25.g23b15deb20.tar.xz

diff --git a/systemd-v255.4+suse.22.g56b53b17bc.tar.xz b/systemd-v255.4+suse.22.g56b53b17bc.tar.xz
deleted file mode 100644
index c2a499a7..00000000
--- a/systemd-v255.4+suse.22.g56b53b17bc.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a55e1ddf7c66e69b057cf1bc8a51c0c6d3936b1633881c42c1585a9c8cfda53e
-size 10774060
diff --git a/systemd-v255.4+suse.25.g23b15deb20.tar.xz b/systemd-v255.4+suse.25.g23b15deb20.tar.xz
new file mode 100644
index 00000000..e2325afd
--- /dev/null
+++ b/systemd-v255.4+suse.25.g23b15deb20.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:496f31746042ed23f3d27fa9073a342f5ffcd0749a898e67d9f2411e0e8edb1f
+size 10773592
diff --git a/systemd.changes b/systemd.changes
index ec402874..57504bad 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May  7 08:33:47 UTC 2024 - Franck Bui <fbui@suse.com>
+
+- Import commit 23b15deb203780580cbfad095ae1071bd2133220
+
+  23b15deb20 gpt-auto-generator: be more defensive when checking the presence of ESP in fstab (bsc#1218671)
+  7ed2979654 journalctl: explicitly check < 0 for error
+  fc5e25d0a0 journalctl: make --until work again with --after-cursor and --lines (bsc#1221906)
+
 -------------------------------------------------------------------
 Thu Apr 25 09:08:21 UTC 2024 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 50d16859..f30e5cbc 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package systemd
+# spec file
 #
 # Copyright (c) 2024 SUSE LLC
 #
@@ -28,7 +28,7 @@
 %else
 %define systemd_version    255.4
 %define systemd_release    0
-%define archive_version    +suse.22.g56b53b17bc
+%define archive_version    +suse.25.g23b15deb20
 %endif
 
 %define systemd_major      %{sub %systemd_version 1 3}
@@ -341,7 +341,7 @@ Requires:       group(lp)
 Requires(pre):  group(kvm)
 Requires(post): sed
 Requires(post): coreutils
-Requires(postun): coreutils
+Requires(postun):coreutils
 # 'regenerate_initrd_post' macro is expanded during build, hence this BR.
 BuildRequires:  suse-module-tools
 %if %{without bootstrap}