From 0df97778f6a7bf1bceeb2d0b5810166e0c7c5340b621ffeb1e36371a2c3af94b Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Sun, 24 Mar 2019 08:43:16 +0000
Subject: [PATCH 1/2] Updating link to change in
 openSUSE:Factory/livecd-openSUSE revision 37.0

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

diff --git a/list-x11.sh b/list-x11.sh
index ffd7a9c..3d8ce16 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -15,6 +15,8 @@ buildignore gtk2-immodule-vietnamese
 buildignore gtk3-immodule-inuktitut
 buildignore gtk3-immodule-thai
 buildignore gtk3-immodule-vietnamese
+buildignore gtk3-lang
+buildignore zenity-lang
 buildignore alsa
 buildignore alsa-plugins
 buildignore xscreensaver
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index d35c5d8..7a6912b 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -333,6 +333,10 @@
     <ignore name="gtk3-immodule-thai"/>
     <package name="aaa_base" replaces="gtk3-immodule-vietnamese"/>
     <ignore name="gtk3-immodule-vietnamese"/>
+    <package name="aaa_base" replaces="gtk3-lang"/>
+    <ignore name="gtk3-lang"/>
+    <package name="aaa_base" replaces="zenity-lang"/>
+    <ignore name="zenity-lang"/>
     <package name="aaa_base" replaces="alsa"/>
     <ignore name="alsa"/>
     <package name="aaa_base" replaces="alsa-plugins"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index fc5ac4d..c7fecca 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Mar 24 09:38:00 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Save space on the rescue CD: skip gtk3-lang and zenity-lang.
+
 -------------------------------------------------------------------
 Tue Mar 12 09:13:58 UTC 2019 - Maurizio Galli <maurizio.galli@gmail.com>
 
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 5481d91..04876ba 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -333,6 +333,10 @@
     <ignore name="gtk3-immodule-thai"/>
     <package name="aaa_base" replaces="gtk3-immodule-vietnamese"/>
     <ignore name="gtk3-immodule-vietnamese"/>
+    <package name="aaa_base" replaces="gtk3-lang"/>
+    <ignore name="gtk3-lang"/>
+    <package name="aaa_base" replaces="zenity-lang"/>
+    <ignore name="zenity-lang"/>
     <package name="aaa_base" replaces="alsa"/>
     <ignore name="alsa"/>
     <package name="aaa_base" replaces="alsa-plugins"/>

From ccf0c7937168297472ce855c5154b662274f0d1be48058873594e9780113dc25 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 25 Mar 2019 09:46:42 +0000
Subject: [PATCH 2/2] - Support new product EULA location

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=26
---
 config.sh               | 4 +++-
 livecd-openSUSE.changes | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config.sh b/config.sh
index b36e54b..e595521 100644
--- a/config.sh
+++ b/config.sh
@@ -58,7 +58,9 @@ for i in /usr/lib/rpm/gnupg/keys/*.asc ; do
 done
 
 # Craft license.tar.gz used by YaST
-(cd /etc/YaST2/licenses/base; tar -cvzf /license.tar.gz *)
+EULA_DIR=/etc/YaST2/licenses/base
+[ -d "${EULA_DIR}" ] || EULA_DIR=/usr/share/licenses/product/base
+(cd "${EULA_DIR}"; tar -cvzf /license.tar.gz *)
 
 # Remove some large locales to save space
 rm -rf /usr/share/locale/{uk,sv,ru,ja,da,cs,sr,vi}
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index c7fecca..1acd240 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 25 09:45:17 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Support new product EULA location
+
 -------------------------------------------------------------------
 Sun Mar 24 09:38:00 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>