From 5fca4787794f0b78c7ceb68ee4f6210d83d5b6cde795db1a2c917c7464b744c0 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Tue, 18 Jun 2024 13:52:17 +0000
Subject: [PATCH] fix rev 1529: the devel packages are really needed by the
 testsuite script to install the dlopened libs into the image

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

diff --git a/systemd.changes b/systemd.changes
index 08a2647d..5bf7a5d6 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Tue Jun 18 13:20:26 UTC 2024 - Franck Bui <fbui@suse.com>
 
-- systemd.spec: move a misplaced %endif in the testsuite sub-package.
+- testsuite: move a misplaced %endif
 
 -------------------------------------------------------------------
 Tue Jun 18 10:19:19 UTC 2024 - Franck Bui <fbui@suse.com>
@@ -11,7 +11,8 @@ Tue Jun 18 10:19:19 UTC 2024 - Franck Bui <fbui@suse.com>
 -------------------------------------------------------------------
 Tue Jun 18 10:12:01 UTC 2024 - Franck Bui <fbui@suse.com>
 
-- Don't pull the devel packages in when installing the testsuite package.
+- testsuite: only require the devel packages when pulling the dlopen'd
+  dependencies (the libraries are dependencies of the devel packages).
 
 -------------------------------------------------------------------
 Thu Jun  6 13:18:29 UTC 2024 - Franck Bui <fbui@suse.com>
diff --git a/systemd.spec b/systemd.spec
index 9579ac23..d30876c8 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -612,6 +612,7 @@ Recommends:     knot
 Recommends:     selinux-policy-devel
 Recommends:     selinux-policy-targeted
 %endif
+Requires:       %{name} = %{version}-%{release}
 # System users/groups that some tests rely on.
 Requires:       group(bin)
 Requires:       group(daemon)
@@ -624,8 +625,12 @@ Requires:       user(nobody)
 # The following deps on libs are for test-dlopen-so whereas the pkgconfig ones
 # are used by test-funtions to find the libs on the host and install them in the
 # image, see install_missing_libraries() for details.
-Requires:       libidn2
-Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig(libfido2)
+Requires:       pkgconfig(libidn2)
+%if %{with experimental}
+Requires:       pkgconfig(libqrencode)
+Requires:       pkgconfig(pwquality)
+%endif
 Requires:       attr
 Requires:       binutils
 Requires:       busybox-static
@@ -635,15 +640,6 @@ Requires:       dosfstools
 Requires:       iproute2
 Requires:       jq
 Requires:       libcap-progs
-Requires:       libfido2
-Requires:       pkgconfig(libidn2)
-%if %{with experimental}
-Requires:       libpwquality1
-Requires:       libqrencode4
-%endif
-Requires:       libtss2-esys0
-Requires:       libtss2-mu0
-Requires:       libtss2-rc0
 Requires:       lz4
 Requires:       make
 Requires:       mtools
@@ -654,6 +650,9 @@ Requires:       quota
 Requires:       socat
 Requires:       squashfs
 Requires:       systemd-container
+Requires:       pkgconfig(tss2-esys)
+Requires:       pkgconfig(tss2-mu)
+Requires:       pkgconfig(tss2-rc)
 %if %{with sd_boot}
 Requires:       systemd-boot
 %endif