From 8966a7ad6a81ca83aba3da1f16ba96227483d2125bc5bef7414d3de6f9a31ca0 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 2 Sep 2019 07:19:40 +0000
Subject: [PATCH 1/2] - Install opensuse-welcome explicitly on Xfce and KDE,
 but blacklist on GNOME

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=46
---
 list-gnome.sh                | 6 ++++--
 livecd-leap-gnome.kiwi       | 7 ++++++-
 livecd-openSUSE.changes      | 7 +------
 livecd-tumbleweed-gnome.kiwi | 7 ++++++-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/list-gnome.sh b/list-gnome.sh
index 8853995..5033804 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -33,6 +33,7 @@ source "$PWD/list-installer.sh"
 buildignore simple-scan
 
 buildignore ghostscript
+buildignore orca
 buildignore myspell-en_US
 
 # Pulls in color management tools
@@ -53,6 +54,7 @@ buildignore inkscape
 
 # Pulls in various python modules and duplicity
 buildignore deja-dup
+buildignore libpython2_7-1_0
 
 buildignore gimp
 buildignore noto-coloremoji-fonts
@@ -90,5 +92,5 @@ install gnome-sudoku
 install quadrapassel
 install cifs-utils
 
-# From x11_enhanced, but that pattern can't be installed
-install opensuse-welcome
+# Pulls in Qt WebEngine, too big
+buildignore opensuse-welcome
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index e78fc91..1647afc 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -462,6 +462,8 @@
     <ignore name="simple-scan"/>
     <package name="aaa_base" replaces="ghostscript"/>
     <ignore name="ghostscript"/>
+    <package name="aaa_base" replaces="orca"/>
+    <ignore name="orca"/>
     <package name="aaa_base" replaces="myspell-en_US"/>
     <ignore name="myspell-en_US"/>
     <package name="aaa_base" replaces="gnome-control-center-color"/>
@@ -482,6 +484,8 @@
     <ignore name="inkscape"/>
     <package name="aaa_base" replaces="deja-dup"/>
     <ignore name="deja-dup"/>
+    <package name="aaa_base" replaces="libpython2_7-1_0"/>
+    <ignore name="libpython2_7-1_0"/>
     <package name="aaa_base" replaces="gimp"/>
     <ignore name="gimp"/>
     <package name="aaa_base" replaces="noto-coloremoji-fonts"/>
@@ -512,7 +516,8 @@
     <package name="gnome-sudoku"/>
     <package name="quadrapassel"/>
     <package name="cifs-utils"/>
-    <package name="opensuse-welcome"/>
+    <package name="aaa_base" replaces="opensuse-welcome"/>
+    <ignore name="opensuse-welcome"/>
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index c63a1a4..a87153d 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,12 +1,7 @@
 -------------------------------------------------------------------
 Fri Aug 30 08:54:24 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
-- Install opensuse-welcome explicitly
-
--------------------------------------------------------------------
-Wed Aug 28 10:34:35 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
-
-- Allow orca on the GNOME Live CD.
+- Install opensuse-welcome explicitly on Xfce and KDE, but blacklist on GNOME
 
 -------------------------------------------------------------------
 Mon Aug 26 09:49:41 UTC 2019 - Maurizio Galli <maurizio.galli@gmail.com>
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 143b5cb..4391973 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -462,6 +462,8 @@
     <ignore name="simple-scan"/>
     <package name="aaa_base" replaces="ghostscript"/>
     <ignore name="ghostscript"/>
+    <package name="aaa_base" replaces="orca"/>
+    <ignore name="orca"/>
     <package name="aaa_base" replaces="myspell-en_US"/>
     <ignore name="myspell-en_US"/>
     <package name="aaa_base" replaces="gnome-control-center-color"/>
@@ -482,6 +484,8 @@
     <ignore name="inkscape"/>
     <package name="aaa_base" replaces="deja-dup"/>
     <ignore name="deja-dup"/>
+    <package name="aaa_base" replaces="libpython2_7-1_0"/>
+    <ignore name="libpython2_7-1_0"/>
     <package name="aaa_base" replaces="gimp"/>
     <ignore name="gimp"/>
     <package name="aaa_base" replaces="noto-coloremoji-fonts"/>
@@ -512,7 +516,8 @@
     <package name="gnome-sudoku"/>
     <package name="quadrapassel"/>
     <package name="cifs-utils"/>
-    <package name="opensuse-welcome"/>
+    <package name="aaa_base" replaces="opensuse-welcome"/>
+    <ignore name="opensuse-welcome"/>
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>

From dee0227a963daafd70d2fe03f78037517b875b4902cfe6bf57d2b380457cc9d4 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 2 Sep 2019 07:20:23 +0000
Subject: [PATCH 2/2] - Install opensuse-welcome explicitly on Xfce and KDE,
 but blacklist on GNOME - Install opensuse-welcome explicitly

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=47
---
 livecd-openSUSE.changes | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index a87153d..0def668 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,7 +1,12 @@
+-------------------------------------------------------------------
+Mon Sep  2 07:19:52 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Install opensuse-welcome explicitly on Xfce and KDE, but blacklist on GNOME
+
 -------------------------------------------------------------------
 Fri Aug 30 08:54:24 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
-- Install opensuse-welcome explicitly on Xfce and KDE, but blacklist on GNOME
+- Install opensuse-welcome explicitly
 
 -------------------------------------------------------------------
 Mon Aug 26 09:49:41 UTC 2019 - Maurizio Galli <maurizio.galli@gmail.com>