From 0063c03e5e0094f45cc17a4532b8379be8a89e1207689ab5cb20178eaefd2a45 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 27 Mar 2023 13:55:11 +0000
Subject: [PATCH] Accepting request 1074712 from
 home:favogt:branches:openSUSE:Factory:Live

- list-kde: Ignore openssh-askpass-gnome and block gtk2
- list-kde: Ignore breeze5-wallpapers on Leap as well now
- list-common: Don't install gtk2-branding-openSUSE explicitly

OBS-URL: https://build.opensuse.org/request/show/1074712
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=145
---
 list-common.sh               | 1 -
 list-kde.sh                  | 8 +++++---
 livecd-leap-gnome.kiwi       | 1 -
 livecd-leap-kde.kiwi         | 7 ++++++-
 livecd-leap-x11.kiwi         | 1 -
 livecd-leap-xfce.kiwi        | 1 -
 livecd-openSUSE.changes      | 7 +++++++
 livecd-tumbleweed-gnome.kiwi | 1 -
 livecd-tumbleweed-kde.kiwi   | 5 ++++-
 livecd-tumbleweed-x11.kiwi   | 1 -
 livecd-tumbleweed-xfce.kiwi  | 1 -
 11 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/list-common.sh b/list-common.sh
index 29cd736..d445e82 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -250,7 +250,6 @@ install bluez-firmware
 install crda
 install dmidecode
 install efibootmgr
-install gtk2-branding-openSUSE
 install ipw-firmware
 install iw
 install libatm1
diff --git a/list-kde.sh b/list-kde.sh
index 1c86235..c833dc6 100644
--- a/list-kde.sh
+++ b/list-kde.sh
@@ -21,6 +21,10 @@ buildignore libreoffice-icon-themes
 buildignore libreoffice-icon-theme-breeze
 buildignore kdenetwork4-filesharing
 buildignore gnome-keyring
+# This pulls in GTK 2. We have ksshaskpass instead.
+buildignore openssh-askpass-gnome
+# Make sure it's not coming back
+buildignore libgtk-2_0-0
 
 # Packages for the installer
 source "$PWD/list-installer.sh"
@@ -66,9 +70,7 @@ buildignore vlc-lang
 buildignore kipi-plugins
 
 # Upstream branding, not used by default and HUGE
-if [ "$distro" != "leap" ]; then
-	buildignore breeze5-wallpapers
-fi
+buildignore breeze5-wallpapers
 
 install partitionmanager
 
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index fe5f106..45fe2a1 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -375,7 +375,6 @@
     <package name="crda"/>
     <package name="dmidecode"/>
     <package name="efibootmgr"/>
-    <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
     <package name="libatm1"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 62e6a95..f6ab7b0 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -375,7 +375,6 @@
     <package name="crda"/>
     <package name="dmidecode"/>
     <package name="efibootmgr"/>
-    <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
     <package name="libatm1"/>
@@ -456,6 +455,10 @@
     <ignore name="kdenetwork4-filesharing"/>
     <package name="aaa_base" replaces="gnome-keyring"/>
     <ignore name="gnome-keyring"/>
+    <package name="aaa_base" replaces="openssh-askpass-gnome"/>
+    <ignore name="openssh-askpass-gnome"/>
+    <package name="aaa_base" replaces="libgtk-2_0-0"/>
+    <ignore name="libgtk-2_0-0"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="yast2-bootloader"/>
@@ -539,6 +542,8 @@
     <ignore name="vlc-lang"/>
     <package name="aaa_base" replaces="kipi-plugins"/>
     <ignore name="kipi-plugins"/>
+    <package name="aaa_base" replaces="breeze5-wallpapers"/>
+    <ignore name="breeze5-wallpapers"/>
     <package name="partitionmanager"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 1d7d1d1..b52b1d5 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -375,7 +375,6 @@
     <package name="crda"/>
     <package name="dmidecode"/>
     <package name="efibootmgr"/>
-    <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
     <package name="libatm1"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index d3657cb..29e7d3c 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -375,7 +375,6 @@
     <package name="crda"/>
     <package name="dmidecode"/>
     <package name="efibootmgr"/>
-    <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
     <package name="libatm1"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 7c53116..0e132e0 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar 27 09:22:14 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- list-kde: Ignore openssh-askpass-gnome and block gtk2
+- list-kde: Ignore breeze5-wallpapers on Leap as well now
+- list-common: Don't install gtk2-branding-openSUSE explicitly
+
 -------------------------------------------------------------------
 Mon Mar 13 10:34:22 UTC 2023 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 11d09af..d03d431 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -375,7 +375,6 @@
     <package name="crda"/>
     <package name="dmidecode"/>
     <package name="efibootmgr"/>
-    <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
     <package name="libatm1"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 02a6308..dfa2e5d 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -375,7 +375,6 @@
     <package name="crda"/>
     <package name="dmidecode"/>
     <package name="efibootmgr"/>
-    <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
     <package name="libatm1"/>
@@ -456,6 +455,10 @@
     <ignore name="kdenetwork4-filesharing"/>
     <package name="aaa_base" replaces="gnome-keyring"/>
     <ignore name="gnome-keyring"/>
+    <package name="aaa_base" replaces="openssh-askpass-gnome"/>
+    <ignore name="openssh-askpass-gnome"/>
+    <package name="aaa_base" replaces="libgtk-2_0-0"/>
+    <ignore name="libgtk-2_0-0"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="yast2-bootloader"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index b1e9f64..4ca0743 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -375,7 +375,6 @@
     <package name="crda"/>
     <package name="dmidecode"/>
     <package name="efibootmgr"/>
-    <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
     <package name="libatm1"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 610a0cd..9b73330 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -375,7 +375,6 @@
     <package name="crda"/>
     <package name="dmidecode"/>
     <package name="efibootmgr"/>
-    <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
     <package name="libatm1"/>