[rpms/systemd] rawhide: Downgrade kbd dependency to Recommends unconditionally

[rpms/systemd] rawhide: Downgrade kbd dependency to Recommends unconditionally

[Martin Pitt]

            A new commit has been pushed.

            Repo   : rpms/systemd
            Branch : rawhide
            Commit : 8c0ffebeea68533f40a2e53ac8620e45eafbc3d7
            Author : Martin Pitt <martin@amutable.com>
            Date   : 2026-07-29T19:27:35+02:00
            Stats  : +0/-5 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/systemd/c/8c0ffebeea68533f40a2e53ac8620e45eafbc3d7?branch=rawhide

            Log:
            Downgrade kbd dependency to Recommends unconditionally

Commit ab743db0 made the dependency weak for %{with upstream} builds
only, because upstream 3327a411be3e ("vconsole-setup: handle gracefully
if setfont/loadkeys are not available") landed after v260 was released.
Rawhide now has v261.2, so the condition is always true here.

The hard requirement came from 01e2d8a9 (2020, rhbz#1408878), which
"upgraded" the Recommends originally added in 4ebba8aa. Now that
systemd-vconsole-setup logs a notice and skips keymap and font setup
when the binaries are absent, kbd is only needed to actually apply a
non-default console keymap or font.

This again lets minimal images that disable weak dependencies leave out
kbd together with the libxkbcommon, xkeyboard-config, and libxml2 chain
it pulls in: about 9 MB uncompressed. That particularly affects initrds,
which are unpacked into RAM.

---
diff --git a/systemd.spec b/systemd.spec
index 71a9958..6a028bd 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -532,13 +532,8 @@ Requires:       libblkid.so.1(BLKID_2.30)%{?elf_bits}
 # https://bugzilla.redhat.com/show_bug.cgi?id=1377733#c9
 Suggests:       systemd-bootchart
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1408878
-%if %{with upstream}
 # v261 handles missing setfont/loadkeys gracefully
 Recommends:     kbd
-%else
-Requires:       kbd
-%endif
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1753381
 Provides:       u2f-hidraw-policy = 1.0.2-40