From 23ff6f659c7a2120954c12a4b54edd48dca4223a116eab3083edc874761ab75c Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Thu, 24 Jun 2021 15:47:39 +0000
Subject: [PATCH] =?UTF-8?q?-=20Import=20commit=20fcdb8dce591db2f5fc3c1e3ee?=
 =?UTF-8?q?b7abe9a2090b401=20=20=20aa2d840a3b=20compat-rules:=20fix=20warn?=
 =?UTF-8?q?ing:=20"label=20=E2=80=98out=E2=80=99=20defined=20but=20not=20u?=
 =?UTF-8?q?sed"=20in=20path=5Fid=5Fcompat.c=20-=20Restore=2061-persistent-?=
 =?UTF-8?q?storage-compat.rules=20that=20was=20mistakenly=20=20=20dropped?=
 =?UTF-8?q?=20during=20the=20merge=20of=20v248.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1164
---
 systemd-mini.changes                      | 10 ++++++++++
 systemd-mini.spec                         |  2 +-
 systemd-v248.3+suse.25.gbc08011f04.tar.xz |  3 ---
 systemd-v248.3+suse.27.gfcdb8dce59.tar.xz |  3 +++
 systemd.changes                           | 10 ++++++++++
 systemd.spec                              |  2 +-
 6 files changed, 25 insertions(+), 5 deletions(-)
 delete mode 100644 systemd-v248.3+suse.25.gbc08011f04.tar.xz
 create mode 100644 systemd-v248.3+suse.27.gfcdb8dce59.tar.xz

diff --git a/systemd-mini.changes b/systemd-mini.changes
index d1a4edd2..1b0c63c9 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jun 24 13:39:30 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Import commit fcdb8dce591db2f5fc3c1e3eeb7abe9a2090b401
+
+  aa2d840a3b compat-rules: fix warning: "label ‘out’ defined but not used" in path_id_compat.c
+
+- Restore 61-persistent-storage-compat.rules that was mistakenly
+  dropped during the merge of v248.
+
 -------------------------------------------------------------------
 Fri Jun 18 12:53:34 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 4312c772..d29a6aa6 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -26,7 +26,7 @@
 ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
 %define mini -mini
 %define min_kernel_version 4.5
-%define suse_version +suse.25.gbc08011f04
+%define suse_version +suse.27.gfcdb8dce59
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}
diff --git a/systemd-v248.3+suse.25.gbc08011f04.tar.xz b/systemd-v248.3+suse.25.gbc08011f04.tar.xz
deleted file mode 100644
index d201f040..00000000
--- a/systemd-v248.3+suse.25.gbc08011f04.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af327ad12cda0119214c8cc6d71f7b0120bec600623d7dacda0e837fcfdd2591
-size 7081120
diff --git a/systemd-v248.3+suse.27.gfcdb8dce59.tar.xz b/systemd-v248.3+suse.27.gfcdb8dce59.tar.xz
new file mode 100644
index 00000000..b2e871a9
--- /dev/null
+++ b/systemd-v248.3+suse.27.gfcdb8dce59.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f885a1a2d22278ddbaa0220fac7e86b8adb89689b0b29e201e14fbec2ab9b502
+size 7080444
diff --git a/systemd.changes b/systemd.changes
index d1a4edd2..1b0c63c9 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jun 24 13:39:30 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Import commit fcdb8dce591db2f5fc3c1e3eeb7abe9a2090b401
+
+  aa2d840a3b compat-rules: fix warning: "label ‘out’ defined but not used" in path_id_compat.c
+
+- Restore 61-persistent-storage-compat.rules that was mistakenly
+  dropped during the merge of v248.
+
 -------------------------------------------------------------------
 Fri Jun 18 12:53:34 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 9f6fd59c..b251488a 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -24,7 +24,7 @@
 %define bootstrap 0
 %define mini %nil
 %define min_kernel_version 4.5
-%define suse_version +suse.25.gbc08011f04
+%define suse_version +suse.27.gfcdb8dce59
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}