From 0af1ccea7c6c6661066a7993a05b006809d50357fc55d7885b600445a94c3b42 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Wed, 26 May 2021 12:20:51 +0000
Subject: [PATCH] Accepting request 895532 from
 home:favogt:branches:openSUSE:Factory:Live

- list-x11: Switch from midori to epiphany

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

diff --git a/list-x11.sh b/list-x11.sh
index f9e7eaa..a2a2cc1 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -53,10 +53,10 @@ buildignore MozillaFirefox
 buildignore tcpdump
 
 install gparted
-install midori
+install epiphany
 # Really ran of out space
 buildignore gparted-lang
-buildignore midori-lang
+buildignore epiaphy-lang
 buildignore iso-codes-lang
 buildignore glib2-lang
 buildignore thunar-lang
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 5a3d070..4703e39 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -517,11 +517,11 @@
     <package name="aaa_base" replaces="tcpdump"/>
     <ignore name="tcpdump"/>
     <package name="gparted"/>
-    <package name="midori"/>
+    <package name="epiphany"/>
     <package name="aaa_base" replaces="gparted-lang"/>
     <ignore name="gparted-lang"/>
-    <package name="aaa_base" replaces="midori-lang"/>
-    <ignore name="midori-lang"/>
+    <package name="aaa_base" replaces="epiaphy-lang"/>
+    <ignore name="epiaphy-lang"/>
     <package name="aaa_base" replaces="iso-codes-lang"/>
     <ignore name="iso-codes-lang"/>
     <package name="aaa_base" replaces="glib2-lang"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 74443a2..b9681fb 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 25 09:44:02 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- list-x11: Switch from midori to epiphany
+
 -------------------------------------------------------------------
 Mon May 10 07:37:43 UTC 2021 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 7084678..b702a88 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -511,11 +511,11 @@
     <package name="aaa_base" replaces="tcpdump"/>
     <ignore name="tcpdump"/>
     <package name="gparted"/>
-    <package name="midori"/>
+    <package name="epiphany"/>
     <package name="aaa_base" replaces="gparted-lang"/>
     <ignore name="gparted-lang"/>
-    <package name="aaa_base" replaces="midori-lang"/>
-    <ignore name="midori-lang"/>
+    <package name="aaa_base" replaces="epiaphy-lang"/>
+    <ignore name="epiaphy-lang"/>
     <package name="aaa_base" replaces="iso-codes-lang"/>
     <ignore name="iso-codes-lang"/>
     <package name="aaa_base" replaces="glib2-lang"/>