From 6e20b974ebb6451713a89c42d61c4ba15341164b Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Tue, 13 Feb 2024 10:05:16 +0100 Subject: [PATCH] separate ALP/SLE branding from openSUSE TW (which resulted in wrong branding packages included in SLE Micro 6.0 raw images) --- _config | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/_config b/_config index ab5a507..7cc7f78 100644 --- a/_config +++ b/_config @@ -900,6 +900,8 @@ Support: rpmlint-strict Prefer: -coreutils-single ### Branding related preferences +### Need to be different openSUSE vs. SLE/ALP +%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:NonFree" Prefer: systemd-default-settings-branding-openSUSE Prefer: distribution-logos-openSUSE-Tumbleweed Prefer: awesome:awesome-branding-upstream @@ -938,6 +940,48 @@ Prefer: hwdata # have choice for xfce4-panel-plugin-whiskermenu needed by xfce4-panel-branding-openSUSE: xfce4-panel-plugin-whiskermenu xfce4-whiskermenu-plugin Prefer: xfce4-panel-branding-openSUSE:xfce4-whiskermenu-plugin Prefer: patterns-xfce-xfce:mate-calc +%else +# SLE / ALP code base +# FIXME: This fixes the impact into raw images, the rest needs to be reviewed +Prefer: systemd-default-settings-branding-openSUSE +Prefer: distribution-logos-openSUSE-Tumbleweed +Prefer: awesome:awesome-branding-upstream +Prefer: cinnamon-gschemas:cinnamon-gschemas-branding-upstream +Prefer: enlightenment-theme-upstream +Prefer: fcitx:fcitx-branding-openSUSE +Prefer: gdm:gdm-branding-upstream +Prefer: gfxboot-branding-openSUSE +Prefer: icewm-theme-branding +Prefer: libcinnamon-desktop-data:libcinnamon-desktop-data-branding-upstream +Prefer: libgarcon-1-0:libgarcon-branding-upstream +Prefer: libgarcon-data:libgarcon-branding-upstream +Prefer: libgio-2_0-0:gio-branding-upstream +Prefer: libpurple-branding-upstream +Prefer: libreoffice:libreoffice-branding-upstream +Prefer: libxfce4ui:libxfce4ui-branding-upstream +Prefer: lightdm-gtk-greeter:lightdm-gtk-greeter-branding-upstream +Prefer: mate-desktop-gschemas:mate-desktop-gschemas-branding-upstream +Prefer: NetworkManager:-NetworkManager-branding-upstream +# ALP specific +Prefer: -NetworkManager-branding-upstream +Prefer: PackageKit:PackageKit-branding-upstream +Prefer: sddm:sddm-branding-upstream +Prefer: sway:sway-branding-upstream +Prefer: systemd-presets-branding-openSUSE +Prefer: wallpaper-branding-openSUSE +Prefer: waybar:waybar-branding-upstream +Prefer: xfce4-notifyd:xfce4-notifyd-branding-upstream +Prefer: xfce4-settings:xfce4-settings-branding-upstream +Prefer: xfdesktop:xfdesktop-branding-upstream +Prefer: yast2-qt:yast2-qt-branding-openSUSE +Prefer: branding-openSUSE +Prefer: chrony-pool-suse +# pciutils-ids and hwdata both provides pciutils-ids +Prefer: hwdata +# have choice for xfce4-panel-plugin-whiskermenu needed by xfce4-panel-branding-openSUSE: xfce4-panel-plugin-whiskermenu xfce4-whiskermenu-plugin +Prefer: xfce4-panel-branding-openSUSE:xfce4-whiskermenu-plugin +Prefer: patterns-xfce-xfce:mate-calc +%endif # Build cycle handling - prefer -mini packages were possible, break deps as needed Conflict: krb5-devel:krb5-mini @@ -1067,7 +1111,11 @@ Prefer: -python39-hotdoc Prefer: -python39-txt2tags -python310-txt2tags -python312-txt2tags # unresolvable: have choice for libcontainers-policy >= 20230214 needed by libcontainers-common: libcontainers-default-policy libcontainers-openSUSE-policy -Prefer: -libcontainers-default-policy +%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:NonFree" +Prefer: libcontainers-openSUSE-policy +%else +Prefer: libcontainers-default-policy +%endif # have choice for python3-jsonschema: python311-jsonschema python311-jsonschema417 Prefer: -python39-jsonschema417 -python310-jsonschema417 -python311-jsonschema417