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

@@ -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

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

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"/>

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"/>

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"/>

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"/>

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>
 

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"/>