From 36db1553c707d5624f085fb618c442b6474ca3ee1920428fb5869885e16e4333 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Wed, 20 Jul 2022 09:38:13 +0000
Subject: [PATCH] Accepting request 990372 from
 home:favogt:branches:openSUSE:Factory:Live

Hopefully 5MiB smaller

- list-x11: Ignore bind-utils

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

diff --git a/config.sh b/config.sh
index 4ec442b..71e6320 100644
--- a/config.sh
+++ b/config.sh
@@ -35,7 +35,7 @@ rpm -qa | grep "^libisl" | xargs -r rpm -e
 [ "$desktop" = "kde" ] && rpm -e --nodeps adwaita-icon-theme
 
 # Workaround until dropped from xfce4-branding-openSUSE
-[ "$desktop" = "x11" -o "$desktop" = "xfce" ] && rpm -e --nodeps noto-coloremoji-fonts
+[ "$desktop" = "x11" -o "$desktop" = "xfce" ] && rpm -e --nodeps noto-coloremoji-fonts xorg-x11-server-Xvfb
 
 #--------------------------------------
 # enable and disable services
diff --git a/list-common.sh b/list-common.sh
index 66d39b0..a877de7 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -299,7 +299,7 @@ install xf86-video-sisusb
 install xf86-video-tdfx
 install xf86-video-v4l
 install xf86-video-vesa
-install xf86-video-voodoo
+#install xf86-video-voodoo
 install xz
 install yast2-trans-de
 if [ "$distro" = "leap" ]; then
@@ -318,3 +318,6 @@ install zip
 
 # Workaround for bsc#1131492
 buildignore ntp
+
+# ignore alsa-plugins-pulse for noe
+buildignore alsa-plugins-pulse
diff --git a/list-kde.sh b/list-kde.sh
index 2e08f89..1c86235 100644
--- a/list-kde.sh
+++ b/list-kde.sh
@@ -80,3 +80,5 @@ install alsa-firmware
 
 # From x11_enhanced, but that pattern can't be installed
 install opensuse-welcome
+
+buildignore bluedevil5
diff --git a/list-x11.sh b/list-x11.sh
index 0a1cc98..c9df79d 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -74,6 +74,7 @@ buildignore groff
 buildignore libqt5-qttranslations
 buildignore plymouth
 buildignore 7zip
+buildignore bind-utils
 
 # tumbler -> libgepup uses libwebkit2gtk-4_0-37, while epiphany uses libwebkit2gtk-4_1-0.
 # We can't have both, too big.
@@ -129,3 +130,6 @@ install NetworkManager-applet
 install xfce4-panel-plugin-xkb
 install xfce4-terminal
 install yast2-control-center-qt
+
+buildignore argyllcms
+
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index ccb60ac..be5b67e 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -423,7 +423,6 @@
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-voodoo"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="yast2-trans-cs"/>
@@ -439,6 +438,8 @@
     <package name="zip"/>
     <package name="aaa_base" replaces="ntp"/>
     <ignore name="ntp"/>
+    <package name="aaa_base" replaces="alsa-plugins-pulse"/>
+    <ignore name="alsa-plugins-pulse"/>
 
     <!-- list-gnome.sh -->
     <package name="aaa_base" replaces="libreoffice-calc"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index e6837d9..4cc8f51 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -423,7 +423,6 @@
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-voodoo"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="yast2-trans-cs"/>
@@ -439,6 +438,8 @@
     <package name="zip"/>
     <package name="aaa_base" replaces="ntp"/>
     <ignore name="ntp"/>
+    <package name="aaa_base" replaces="alsa-plugins-pulse"/>
+    <ignore name="alsa-plugins-pulse"/>
 
     <!-- list-kde.sh -->
     <package name="aaa_base" replaces="gvfs"/>
@@ -540,6 +541,8 @@
     <ignore name="cyrus-sasl"/>
     <package name="alsa-firmware"/>
     <package name="opensuse-welcome"/>
+    <package name="aaa_base" replaces="bluedevil5"/>
+    <ignore name="bluedevil5"/>
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 82231dd..9c3f7a0 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -423,7 +423,6 @@
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-voodoo"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="yast2-trans-cs"/>
@@ -439,6 +438,8 @@
     <package name="zip"/>
     <package name="aaa_base" replaces="ntp"/>
     <ignore name="ntp"/>
+    <package name="aaa_base" replaces="alsa-plugins-pulse"/>
+    <ignore name="alsa-plugins-pulse"/>
 
     <!-- list-x11.sh -->
     <package name="aaa_base" replaces="NetworkManager-lang"/>
@@ -575,6 +576,8 @@
     <ignore name="plymouth"/>
     <package name="aaa_base" replaces="7zip"/>
     <ignore name="7zip"/>
+    <package name="aaa_base" replaces="bind-utils"/>
+    <ignore name="bind-utils"/>
     <package name="aaa_base" replaces="tumbler"/>
     <ignore name="tumbler"/>
     <package name="aaa_base" replaces="ristretto"/>
@@ -622,6 +625,8 @@
     <package name="xfce4-panel-plugin-xkb"/>
     <package name="xfce4-terminal"/>
     <package name="yast2-control-center-qt"/>
+    <package name="aaa_base" replaces="argyllcms"/>
+    <ignore name="argyllcms"/>
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index 79e199f..2a19757 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -423,7 +423,6 @@
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-voodoo"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="yast2-trans-cs"/>
@@ -439,6 +438,8 @@
     <package name="zip"/>
     <package name="aaa_base" replaces="ntp"/>
     <ignore name="ntp"/>
+    <package name="aaa_base" replaces="alsa-plugins-pulse"/>
+    <ignore name="alsa-plugins-pulse"/>
 
     <!-- list-xfce.sh -->
     <package name="branding-openSUSE"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 37ebf80..ce62f9e 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jul 20 09:13:34 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- list-x11: Ignore bind-utils
+
+-------------------------------------------------------------------
+Thu Jul  7 20:56:36 UTC 2022 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Ignore alsa-plugins-pulse for now: conflicts with pipewire. 
+
 -------------------------------------------------------------------
 Mon Feb 28 10:20:14 UTC 2022 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index d8e12b8..490ca19 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -426,13 +426,14 @@
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-voodoo"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="zd1211-firmware"/>
     <package name="zip"/>
     <package name="aaa_base" replaces="ntp"/>
     <ignore name="ntp"/>
+    <package name="aaa_base" replaces="alsa-plugins-pulse"/>
+    <ignore name="alsa-plugins-pulse"/>
 
     <!-- list-gnome.sh -->
     <package name="aaa_base" replaces="libreoffice-calc"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index c8fab70..e7e807e 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -426,13 +426,14 @@
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-voodoo"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="zd1211-firmware"/>
     <package name="zip"/>
     <package name="aaa_base" replaces="ntp"/>
     <ignore name="ntp"/>
+    <package name="aaa_base" replaces="alsa-plugins-pulse"/>
+    <ignore name="alsa-plugins-pulse"/>
 
     <!-- list-kde.sh -->
     <package name="aaa_base" replaces="gvfs"/>
@@ -536,6 +537,8 @@
     <ignore name="cyrus-sasl"/>
     <package name="alsa-firmware"/>
     <package name="opensuse-welcome"/>
+    <package name="aaa_base" replaces="bluedevil5"/>
+    <ignore name="bluedevil5"/>
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index ec50d0e..cc6a5cc 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -426,13 +426,14 @@
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-voodoo"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="zd1211-firmware"/>
     <package name="zip"/>
     <package name="aaa_base" replaces="ntp"/>
     <ignore name="ntp"/>
+    <package name="aaa_base" replaces="alsa-plugins-pulse"/>
+    <ignore name="alsa-plugins-pulse"/>
 
     <!-- list-x11.sh -->
     <package name="aaa_base" replaces="NetworkManager-lang"/>
@@ -569,6 +570,8 @@
     <ignore name="plymouth"/>
     <package name="aaa_base" replaces="7zip"/>
     <ignore name="7zip"/>
+    <package name="aaa_base" replaces="bind-utils"/>
+    <ignore name="bind-utils"/>
     <package name="aaa_base" replaces="tumbler"/>
     <ignore name="tumbler"/>
     <package name="aaa_base" replaces="ristretto"/>
@@ -616,6 +619,8 @@
     <package name="xfce4-panel-plugin-xkb"/>
     <package name="xfce4-terminal"/>
     <package name="yast2-control-center-qt"/>
+    <package name="aaa_base" replaces="argyllcms"/>
+    <ignore name="argyllcms"/>
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 697c085..11153f5 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -426,13 +426,14 @@
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-voodoo"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="zd1211-firmware"/>
     <package name="zip"/>
     <package name="aaa_base" replaces="ntp"/>
     <ignore name="ntp"/>
+    <package name="aaa_base" replaces="alsa-plugins-pulse"/>
+    <ignore name="alsa-plugins-pulse"/>
 
     <!-- list-xfce.sh -->
     <package name="branding-openSUSE"/>