From 1af8e5f9deafa995401191818819b053260e3d4480084967c3c1839a5091e030 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Fri, 28 Jun 2019 06:22:16 +0000
Subject: [PATCH 1/2] Updating link to change in
 openSUSE:Factory/livecd-openSUSE revision 51.0

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

diff --git a/list-x11.sh b/list-x11.sh
index d68c509..c10bbf6 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -7,6 +7,7 @@ buildignore unzip-doc
 buildignore gtk2-immodule-inuktitut
 buildignore gtk2-immodule-thai
 buildignore gtk2-immodule-vietnamese
+buildignore gtk2-lang
 buildignore gtk3-immodule-inuktitut
 buildignore gtk3-immodule-thai
 buildignore gtk3-immodule-vietnamese
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 9ae6d55..07a6427 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -427,6 +427,8 @@
     <ignore name="gtk2-immodule-thai"/>
     <package name="aaa_base" replaces="gtk2-immodule-vietnamese"/>
     <ignore name="gtk2-immodule-vietnamese"/>
+    <package name="aaa_base" replaces="gtk2-lang"/>
+    <ignore name="gtk2-lang"/>
     <package name="aaa_base" replaces="gtk3-immodule-inuktitut"/>
     <ignore name="gtk3-immodule-inuktitut"/>
     <package name="aaa_base" replaces="gtk3-immodule-thai"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 8e39cb4..d91e08e 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 28 06:21:43 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Block gtk2-lang from the Rescue CD - We run again out of space.
+
 -------------------------------------------------------------------
 Fri Jun  7 11:20:37 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 381d712..7dc02e2 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -427,6 +427,8 @@
     <ignore name="gtk2-immodule-thai"/>
     <package name="aaa_base" replaces="gtk2-immodule-vietnamese"/>
     <ignore name="gtk2-immodule-vietnamese"/>
+    <package name="aaa_base" replaces="gtk2-lang"/>
+    <ignore name="gtk2-lang"/>
     <package name="aaa_base" replaces="gtk3-immodule-inuktitut"/>
     <ignore name="gtk3-immodule-inuktitut"/>
     <package name="aaa_base" replaces="gtk3-immodule-thai"/>

From 6a72047e2b4f50d5c0233e1bc6f6c80d4b0ebc80f58753e2db3ae08cfb936d1c Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Fri, 26 Jul 2019 12:13:20 +0000
Subject: [PATCH 2/2] Accepting request 718861 from home:favogt:deltalive

- Move deltarpm ignore to list-x11 to allow libzypp-plugin-appdata
  elsewhere

OBS-URL: https://build.opensuse.org/request/show/718861
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=37
---
 list-common.sh               | 1 -
 list-x11.sh                  | 3 +++
 livecd-leap-gnome.kiwi       | 2 --
 livecd-leap-kde.kiwi         | 2 --
 livecd-leap-x11.kiwi         | 4 ++--
 livecd-openSUSE.changes      | 6 ++++++
 livecd-tumbleweed-gnome.kiwi | 2 --
 livecd-tumbleweed-kde.kiwi   | 2 --
 livecd-tumbleweed-x11.kiwi   | 4 ++--
 livecd-tumbleweed-xfce.kiwi  | 2 --
 10 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/list-common.sh b/list-common.sh
index 9f3f948..555ca4b 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -70,7 +70,6 @@ buildignore xorg-x11-Xvnc
 buildignore cabextract
 buildignore sssd
 buildignore db-utils
-buildignore deltarpm
 buildignore dnsmasq
 buildignore fribidi
 buildignore ipmitool
diff --git a/list-x11.sh b/list-x11.sh
index c10bbf6..f92fead 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -46,6 +46,9 @@ install midori
 # Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD
 buildignore cyrus-sasl
 
+# Moved here from list-common.sh. Needed by createrepo_c, which is needed for libzypp-plugin-appdata
+buildignore deltarpm
+
 # Previously required by rest_cd_x11
 install patterns-xfce-xfce_basis
 installPattern xfce_basis
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index b61ad50..732810c 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -181,8 +181,6 @@
     <ignore name="sssd"/>
     <package name="aaa_base" replaces="db-utils"/>
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="deltarpm"/>
-    <ignore name="deltarpm"/>
     <package name="aaa_base" replaces="dnsmasq"/>
     <ignore name="dnsmasq"/>
     <package name="aaa_base" replaces="fribidi"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 85c8ddf..b15b0da 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -181,8 +181,6 @@
     <ignore name="sssd"/>
     <package name="aaa_base" replaces="db-utils"/>
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="deltarpm"/>
-    <ignore name="deltarpm"/>
     <package name="aaa_base" replaces="dnsmasq"/>
     <ignore name="dnsmasq"/>
     <package name="aaa_base" replaces="fribidi"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 07a6427..c757a5e 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -181,8 +181,6 @@
     <ignore name="sssd"/>
     <package name="aaa_base" replaces="db-utils"/>
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="deltarpm"/>
-    <ignore name="deltarpm"/>
     <package name="aaa_base" replaces="dnsmasq"/>
     <ignore name="dnsmasq"/>
     <package name="aaa_base" replaces="fribidi"/>
@@ -487,6 +485,8 @@
     <package name="midori"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
+    <package name="aaa_base" replaces="deltarpm"/>
+    <ignore name="deltarpm"/>
     <package name="patterns-xfce-xfce_basis"/>
     <namedCollection name="xfce_basis"/>
     <package name="evince"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index d91e08e..de95d52 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 26 12:08:16 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Move deltarpm ignore to list-x11 to allow libzypp-plugin-appdata
+  elsewhere
+
 -------------------------------------------------------------------
 Fri Jun 28 06:21:43 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index f3f1289..2458be4 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -181,8 +181,6 @@
     <ignore name="sssd"/>
     <package name="aaa_base" replaces="db-utils"/>
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="deltarpm"/>
-    <ignore name="deltarpm"/>
     <package name="aaa_base" replaces="dnsmasq"/>
     <ignore name="dnsmasq"/>
     <package name="aaa_base" replaces="fribidi"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index f2445f7..c165192 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -181,8 +181,6 @@
     <ignore name="sssd"/>
     <package name="aaa_base" replaces="db-utils"/>
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="deltarpm"/>
-    <ignore name="deltarpm"/>
     <package name="aaa_base" replaces="dnsmasq"/>
     <ignore name="dnsmasq"/>
     <package name="aaa_base" replaces="fribidi"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 7dc02e2..86e9cd0 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -181,8 +181,6 @@
     <ignore name="sssd"/>
     <package name="aaa_base" replaces="db-utils"/>
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="deltarpm"/>
-    <ignore name="deltarpm"/>
     <package name="aaa_base" replaces="dnsmasq"/>
     <ignore name="dnsmasq"/>
     <package name="aaa_base" replaces="fribidi"/>
@@ -487,6 +485,8 @@
     <package name="midori"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
+    <package name="aaa_base" replaces="deltarpm"/>
+    <ignore name="deltarpm"/>
     <package name="patterns-xfce-xfce_basis"/>
     <namedCollection name="xfce_basis"/>
     <package name="evince"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index d232c6a..56473c9 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -181,8 +181,6 @@
     <ignore name="sssd"/>
     <package name="aaa_base" replaces="db-utils"/>
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="deltarpm"/>
-    <ignore name="deltarpm"/>
     <package name="aaa_base" replaces="dnsmasq"/>
     <ignore name="dnsmasq"/>
     <package name="aaa_base" replaces="fribidi"/>