fix conflict resolution

- remove yast2-logs from transactional base
- rename the systemd-presets-branding to -SLE_transactional (forwarded request 1319696 from jsrain)

OBS-URL: https://build.opensuse.org/request/show/1319742
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patterns-base?expand=0&rev=138

patterns-base.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Nov 24 09:58:43 UTC 2025 - Jiri Srain <jsrain@suse.com>
+
+- remove yast2-logs from transactional base
+- rename the systemd-presets-branding to -SLE_transactional
+
+-------------------------------------------------------------------
+Fri Nov 21 13:30:02 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
+
+- Drop biosdevname, this is being replaced by systemd predictable
+  network interface naming (jsc#PED-262).
+
+-------------------------------------------------------------------
+Fri Nov 14 13:36:38 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
+
+- Remove dbus-1-glib, it's a shared library and thus pulled in by
+  applications requring it automatically
+
+-------------------------------------------------------------------
+Fri Nov 14 08:44:24 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
+
+- Remove dbus-1-x11, doesn't work with dbus-broker [bsc#1253497]
+
 -------------------------------------------------------------------
 Fri Aug 22 10:26:07 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
 

patterns-base.spec

@@ -501,8 +501,6 @@ Recommends:     vim
 Recommends:     wget
 Recommends:     xz
 Recommends:     zisofs-tools
-# DELL computers mainly #403270, but #441079
-Suggests:       biosdevname
 Suggests:       cpupower
 # #437252
 Suggests:       pam_ssh
@@ -677,11 +675,6 @@ Provides:       pattern() = bootloader
 Requires:       (grub2-snapper-plugin if snapper)
 #
 Requires:       grub2
-%ifarch x86_64
-# XXX: not sure this really belongs here. More like a kernel
-# rather than bootloader related thing?
-Requires:       biosdevname
-%endif
 %ifnarch s390x ppc64 ppc64le
 %if 0%{?is_opensuse}
 Requires:       (grub2-branding-openSUSE if branding-openSUSE)
@@ -821,7 +814,6 @@ Requires:       openssh
 Requires:       read-only-root-fs
 Requires:       rebootmgr
 Requires:       sudo
-Requires:       yast2-logs
 Requires:       zypp-boot-plugin
 Requires:       (health-checker if grub2)
 Requires:       (health-checker-plugins-MicroOS if health-checker)
@@ -839,7 +831,7 @@ Requires:       dosfstools
 %else
 Requires:       iputils
 Requires:       supportutils
-Requires:       systemd-presets-branding-ALP-transactional
+Requires:       systemd-presets-branding-SLE_transactional
 Requires:       toolbox
 Requires:       toolbox-branding-SLE
 Requires:       group(wheel)
@@ -1005,8 +997,6 @@ Requires:       xorg-x11-essentials
 Recommends:     cabextract
 # Bug 424707 - Feature "Command not found" for openSUSE by default
 Recommends:     command-not-found
-Recommends:     dbus-1-glib
-Recommends:     dbus-1-x11
 Recommends:     dialog
 Recommends:     fontconfig
 Recommends:     fonts-config