From 2cdefc721763e6f1b419ce979c6fc886ba840badd34e0df198046736983672f7 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Mon, 22 Nov 2021 08:47:06 +0000
Subject: [PATCH 1/2] - Update the dependencies of the systemd-testsuite
 sub-package.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1212
---
 systemd.changes | 5 +++++
 systemd.spec    | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/systemd.changes b/systemd.changes
index f8d24e2..ce963c6 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 22 08:43:25 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Update the dependencies of the systemd-testsuite sub-package.
+
 -------------------------------------------------------------------
 Mon Nov 15 09:35:08 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index d1a7e15..613becc 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -518,6 +518,7 @@ Requires:       cryptsetup
 Requires:       dosfstools
 Requires:       libcap-progs
 Requires:       lz4
+Requires:       make
 Requires:       netcat
 Requires:       qemu-kvm
 Requires:       quota
@@ -537,6 +538,9 @@ Requires:       systemd-experimental
 %if %{with journal_remote}
 Requires:       systemd-journal-remote
 %endif
+%if %{with networkd}
+Requires:       systemd-network
+%endif
 %if %{with portabled}
 Requires:       systemd-portable
 %endif
@@ -897,6 +901,10 @@ rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket
 
 %if %{with testsuite}
 cp -a test %{buildroot}%{_testsuitedir}/
+# When the tests are installed, the effective testdata directory is in
+# %{_testsuitedir}, the other one, which is actually a symlink, is
+# only useful when the tests are run directly from the source.
+rm %{buildroot}%{_testsuitedir}/test/testdata
 # kbd-model-map became a dangling symlink, drop it.
 rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map
 find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \;

From c829649b086f5970da7f1b9320d5b995fd664a9325472f513dbf4473ae51fb8f Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Mon, 22 Nov 2021 09:12:53 +0000
Subject: [PATCH 2/2] - Import commit 523f32df573d459551760b072cb62906f4a2cf23
 (merge of 249.7)   For a complete list of changes, visit:  
 https://github.com/openSUSE/systemd/compare/c34c98712600bc206919ec6ed136195f75ac1967...523f32df573d459551760b072cb62906f4a2cf23
 - Import commit c34c98712600bc206919ec6ed136195f75ac1967   f99aa40c6e
 TEST-12: make sure 'adm' group exist   6c7194ff99 TEST-08: don't force ext4
 for /   dd1814b8f9 test: use kbd-mode-map we ship in one more test case  
 94c5febf2a test: fix TEST-10-ISSUE-2467

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1213
---
 systemd-v249.6+suse.50.g61c79e6838.tar.xz |  3 ---
 systemd-v249.7+suse.57.g523f32df57.tar.xz |  3 +++
 systemd.changes                           | 15 +++++++++++++++
 systemd.spec                              |  4 ++--
 4 files changed, 20 insertions(+), 5 deletions(-)
 delete mode 100644 systemd-v249.6+suse.50.g61c79e6838.tar.xz
 create mode 100644 systemd-v249.7+suse.57.g523f32df57.tar.xz

diff --git a/systemd-v249.6+suse.50.g61c79e6838.tar.xz b/systemd-v249.6+suse.50.g61c79e6838.tar.xz
deleted file mode 100644
index 83096fa..0000000
--- a/systemd-v249.6+suse.50.g61c79e6838.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18f1ac7b13a20f603d4a3601d17afa2ba9f0856f0e3efa83455735121ecc394e
-size 7269052
diff --git a/systemd-v249.7+suse.57.g523f32df57.tar.xz b/systemd-v249.7+suse.57.g523f32df57.tar.xz
new file mode 100644
index 0000000..b19fc65
--- /dev/null
+++ b/systemd-v249.7+suse.57.g523f32df57.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:688c3f4409788f5ecea74d1dd6c5d1b2fbeb789a6c24c79bd35ed5f62c4b119c
+size 7275376
diff --git a/systemd.changes b/systemd.changes
index ce963c6..ea9ee3f 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Nov 22 08:48:12 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Import commit 523f32df573d459551760b072cb62906f4a2cf23 (merge of 249.7)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/c34c98712600bc206919ec6ed136195f75ac1967...523f32df573d459551760b072cb62906f4a2cf23
+
+- Import commit c34c98712600bc206919ec6ed136195f75ac1967
+
+  f99aa40c6e TEST-12: make sure 'adm' group exist
+  6c7194ff99 TEST-08: don't force ext4 for /
+  dd1814b8f9 test: use kbd-mode-map we ship in one more test case
+  94c5febf2a test: fix TEST-10-ISSUE-2467
+
 -------------------------------------------------------------------
 Mon Nov 22 08:43:25 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 613becc..522090e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -32,7 +32,7 @@
 %endif
 
 %define min_kernel_version 4.5
-%define suse_version +suse.50.g61c79e6838
+%define suse_version +suse.57.g523f32df57
 %define _testsuitedir /usr/lib/systemd/tests
 
 %if 0%{?bootstrap}
@@ -69,7 +69,7 @@
 
 Name:           systemd%{?mini}
 URL:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        249.6
+Version:        249.7
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1-or-later