From 2ec975724e4cd171d668051eb09f7374c3aaa41709b515e18e9afc3a3953e929 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Fri, 19 Aug 2022 07:58:03 +0000
Subject: [PATCH] Accepting request 998113 from
 home:favogt:branches:openSUSE:Factory:Live

- list-gnome: Ignore yelp, needed especially on Leap
- list-common: vim-small is also available on Leap meanwhile

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

diff --git a/list-common.sh b/list-common.sh
index d2d5a40..abee241 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -211,10 +211,8 @@ buildignore gstreamer-plugins-rs
 
 # Make vim smaller
 buildignore vim-data
-if [ "$distro" = "tumbleweed" ]; then
-        buildignore vim
-        install vim-small
-fi
+buildignore vim
+install vim-small
 
 # This was previously required by base
 install patterns-yast-yast2_basis
diff --git a/list-gnome.sh b/list-gnome.sh
index a7d90e1..899da65 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -117,3 +117,6 @@ install quadrapassel
 
 # Pulls in Qt WebEngine, too big
 buildignore opensuse-welcome
+
+# Pulls in a different WebKit version on Leap and doesn't offer any useful manuals anyway
+buildignore yelp
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 64ef5d7..c07b468 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -348,6 +348,9 @@
     <ignore name="gstreamer-plugins-rs"/>
     <package name="aaa_base" replaces="vim-data"/>
     <ignore name="vim-data"/>
+    <package name="aaa_base" replaces="vim"/>
+    <ignore name="vim"/>
+    <package name="vim-small"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
@@ -589,6 +592,8 @@
     <package name="quadrapassel"/>
     <package name="aaa_base" replaces="opensuse-welcome"/>
     <ignore name="opensuse-welcome"/>
+    <package name="aaa_base" replaces="yelp"/>
+    <ignore name="yelp"/>
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 76de0dd..c62f4a8 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -348,6 +348,9 @@
     <ignore name="gstreamer-plugins-rs"/>
     <package name="aaa_base" replaces="vim-data"/>
     <ignore name="vim-data"/>
+    <package name="aaa_base" replaces="vim"/>
+    <ignore name="vim"/>
+    <package name="vim-small"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index e395b87..5f339cd 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -348,6 +348,9 @@
     <ignore name="gstreamer-plugins-rs"/>
     <package name="aaa_base" replaces="vim-data"/>
     <ignore name="vim-data"/>
+    <package name="aaa_base" replaces="vim"/>
+    <ignore name="vim"/>
+    <package name="vim-small"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index ab0e303..cbe0e80 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -348,6 +348,9 @@
     <ignore name="gstreamer-plugins-rs"/>
     <package name="aaa_base" replaces="vim-data"/>
     <ignore name="vim-data"/>
+    <package name="aaa_base" replaces="vim"/>
+    <ignore name="vim"/>
+    <package name="vim-small"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 4a4fba3..677aacd 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 19 07:30:34 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- list-gnome: Ignore yelp, needed especially on Leap
+- list-common: vim-small is also available on Leap meanwhile
+
 -------------------------------------------------------------------
 Mon Aug  8 07:51:52 UTC 2022 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 8fe7991..77a79bd 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -583,6 +583,8 @@
     <package name="quadrapassel"/>
     <package name="aaa_base" replaces="opensuse-welcome"/>
     <ignore name="opensuse-welcome"/>
+    <package name="aaa_base" replaces="yelp"/>
+    <ignore name="yelp"/>
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>