From 6f224a5aceb14efe93c62aea973811fcb55686ccb6459a460b3f25d8240a9817 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 2 Sep 2019 07:23:22 +0000
Subject: [PATCH 1/2] Revert changes without changelog entries

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=48
---
 list-gnome.sh                | 2 --
 livecd-leap-gnome.kiwi       | 4 ----
 livecd-tumbleweed-gnome.kiwi | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/list-gnome.sh b/list-gnome.sh
index 5033804..2476920 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -33,7 +33,6 @@ source "$PWD/list-installer.sh"
 buildignore simple-scan
 
 buildignore ghostscript
-buildignore orca
 buildignore myspell-en_US
 
 # Pulls in color management tools
@@ -54,7 +53,6 @@ buildignore inkscape
 
 # Pulls in various python modules and duplicity
 buildignore deja-dup
-buildignore libpython2_7-1_0
 
 buildignore gimp
 buildignore noto-coloremoji-fonts
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 1647afc..9be9c4e 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -462,8 +462,6 @@
     <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"/>
@@ -484,8 +482,6 @@
     <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"/>
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 4391973..5ac51ac 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -462,8 +462,6 @@
     <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"/>
@@ -484,8 +482,6 @@
     <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"/>

From caeb86cd9d2e44ad8c8307cd647046fb3432a7fc85736532d81b6624a3feca6d Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 2 Sep 2019 13:23:48 +0000
Subject: [PATCH 2/2] - no py2 on gnome live

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

diff --git a/list-gnome.sh b/list-gnome.sh
index 2476920..4020e6c 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -53,6 +53,7 @@ buildignore inkscape
 
 # Pulls in various python modules and duplicity
 buildignore deja-dup
+buildignore libpython2_7-1_0
 
 buildignore gimp
 buildignore noto-coloremoji-fonts
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 9be9c4e..89111b2 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -482,6 +482,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"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 0def668..436d589 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  2 13:23:00 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- no py2 on gnome live
+
 -------------------------------------------------------------------
 Mon Sep  2 07:19:52 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 5ac51ac..61500ae 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -482,6 +482,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"/>