Revert "Release bump systemd-boot to use new keys (#11439)"

This reverts commit c36b428.

Author: jslobodzian

SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec

@@ -14,7 +14,7 @@ Version:        255
 # determine the build information from local checkout
 Version:        %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
 %endif
-Release:        19%{?dist}
+Release:        18%{?dist}
 License:        LGPL-2.1-or-later AND MIT AND GPL-2.0-or-later
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -53,9 +53,6 @@ Provides: version(systemd-boot)%{_isa} = %version
 Obsoletes: systemd-udev < 252.2^
 Conflicts: grub2-efi-binary
 
-Recommends:     shim >= 15.8-3
-Conflicts:      shim < 15.8-3
-
 %description -n systemd-boot
 systemd-boot (short: sd-boot) is a simple UEFI boot manager. It provides a
 graphical menu to select the entry to boot and an editor for the kernel command
@@ -93,10 +90,6 @@ popd
 /boot/efi/EFI/BOOT/grubx64.efi
 
 %changelog
-* Thu Dec 12 2024 Daniel McIlvaney <damcilva@microsoft.com> - 255-19
-- Version bump to force signing with new Azure Linux secure boot key
-- Add confilcts/recommends on shim to ensure the keys match
-
 * Fri Sep 13 2024 Thien Trung Vuong <tvuong@microsoft.com> - 255-18
 - Update sd-boot install location
 

SPECS/systemd/systemd.spec

@@ -50,7 +50,7 @@ Version:        255
 # determine the build information from local checkout
 Version:        %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
 %endif
-Release:        19%{?dist}
+Release:        18%{?dist}
 
 # FIXME - hardcode to 'stable' for now as that's what we have in our blobstore
 %global stable 1
@@ -1216,9 +1216,6 @@ rm -f %{name}.lang
 # %autochangelog. So we need to continue manually maintaining the
 # changelog here.
 %changelog
-* Thu Dec 12 2024 Daniel McIlvaney <damcilva@microsoft.com> - 255-19
-- Version bump to force signing with new Azure Linux secure boot key
-
 * Fri Sep 13 2024 Thien Trung Vuong <tvuong@microsoft.com> - 255-18
 - Install systemd-boot binary to ESP