From 194d988614e238998b2912af9042be831364f7a728478ce06df938d5784f40cc Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Thu, 30 Sep 2021 07:35:34 +0000
Subject: [PATCH] - list-xfce: Ignore mugshot, incompatible with GNOME 41   in
 /usr/lib

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=113
---
 config.sh                   |  3 ++-
 list-kde.sh                 |  3 +++
 list-xfce.sh                |  3 +++
 livecd-leap-kde.kiwi        |  6 ++++++
 livecd-leap-xfce.kiwi       |  2 ++
 livecd-openSUSE.changes     | 16 ++++++++++++++++
 livecd-tumbleweed-kde.kiwi  |  6 ++++++
 livecd-tumbleweed-xfce.kiwi |  2 ++
 8 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/config.sh b/config.sh
index b94818b..1ad67d5 100644
--- a/config.sh
+++ b/config.sh
@@ -96,7 +96,8 @@ rm -rf /usr/share/doc/packages/*
 rm -rf /lib/firmware/{liquidio,netronome,qed,mrvl,mellanox,qcom,cypress,dpaa2,bnx2x}
 
 # Not needed, boo#1166406
-rm /boot/vmlinux*.[gx]z
+rm -f /boot/vmlinux*.[gx]z
+rm -f /usr/lib/modules/*/vmlinux*.[gx]z
 
 # Add repos from /etc/YaST2/control.xml
 add-yast-repos
diff --git a/list-kde.sh b/list-kde.sh
index 69d0cd8..8c001ea 100644
--- a/list-kde.sh
+++ b/list-kde.sh
@@ -59,6 +59,9 @@ buildignore icewm
 buildignore kmahjongg-lang
 buildignore konversation-lang
 buildignore libproxy1-pacrunner-webkit
+buildignore vlc
+buildignore vlc-noX
+buildignore vlc-qt
 buildignore vlc-lang
 buildignore kipi-plugins
 
diff --git a/list-xfce.sh b/list-xfce.sh
index a2e0359..7d1d9a2 100644
--- a/list-xfce.sh
+++ b/list-xfce.sh
@@ -41,5 +41,8 @@ install evince-plugin-pdfdocument
 # From rest_cd_core
 install alsa-firmware
 
+# Not compatible with GNOME 41 (nothing provides typelib(Cheese) = 3.0)
+buildignore mugshot
+
 # From x11_enhanced, but that pattern can't be installed
 install opensuse-welcome
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 37a7c03..3fb2ec9 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -515,6 +515,12 @@
     <ignore name="konversation-lang"/>
     <package name="aaa_base" replaces="libproxy1-pacrunner-webkit"/>
     <ignore name="libproxy1-pacrunner-webkit"/>
+    <package name="aaa_base" replaces="vlc"/>
+    <ignore name="vlc"/>
+    <package name="aaa_base" replaces="vlc-noX"/>
+    <ignore name="vlc-noX"/>
+    <package name="aaa_base" replaces="vlc-qt"/>
+    <ignore name="vlc-qt"/>
     <package name="aaa_base" replaces="vlc-lang"/>
     <ignore name="vlc-lang"/>
     <package name="aaa_base" replaces="kipi-plugins"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index e005e29..56650f0 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -484,6 +484,8 @@
     <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="evince-plugin-pdfdocument"/>
     <package name="alsa-firmware"/>
+    <package name="aaa_base" replaces="mugshot"/>
+    <ignore name="mugshot"/>
     <package name="opensuse-welcome"/>
   </packages>
   <packages type="bootstrap">
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index a9371c6..9721512 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Sep 30 07:34:07 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- list-xfce: Ignore mugshot, incompatible with GNOME 41
+
+-------------------------------------------------------------------
+Tue Aug 24 14:39:26 UTC 2021 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- config.sh: Also remove vmlinux.xz from UsrMerged kernel location
+  in /usr/lib
+
+-------------------------------------------------------------------
+Tue Aug 24 06:22:09 UTC 2021 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- list-kde: drop VLC media player.
+
 -------------------------------------------------------------------
 Mon Aug  9 12:48:47 UTC 2021 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 676e53d..c374718 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -509,6 +509,12 @@
     <ignore name="konversation-lang"/>
     <package name="aaa_base" replaces="libproxy1-pacrunner-webkit"/>
     <ignore name="libproxy1-pacrunner-webkit"/>
+    <package name="aaa_base" replaces="vlc"/>
+    <ignore name="vlc"/>
+    <package name="aaa_base" replaces="vlc-noX"/>
+    <ignore name="vlc-noX"/>
+    <package name="aaa_base" replaces="vlc-qt"/>
+    <ignore name="vlc-qt"/>
     <package name="aaa_base" replaces="vlc-lang"/>
     <ignore name="vlc-lang"/>
     <package name="aaa_base" replaces="kipi-plugins"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index c6630cd..f736bde 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -478,6 +478,8 @@
     <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="evince-plugin-pdfdocument"/>
     <package name="alsa-firmware"/>
+    <package name="aaa_base" replaces="mugshot"/>
+    <ignore name="mugshot"/>
     <package name="opensuse-welcome"/>
   </packages>
   <packages type="bootstrap">