From 1aa7d52148099f0e8af31b3bfd734f9f2444fbf78319466ae9857e9e4dda9fa4 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Thu, 14 Sep 2023 20:10:37 +0000
Subject: [PATCH 1/2] Updating link to change in
 openSUSE:Factory/livecd-openSUSE revision 208

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

diff --git a/list-x11.sh b/list-x11.sh
index b1aeb57..a868c4c 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -54,7 +54,6 @@ buildignore aspell-en
 buildignore ModemManager
 buildignore avahi
 buildignore fprintd
-buildignore accountsservice
 buildignore MozillaFirefox
 buildignore tcpdump
 
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index a0a0510..7a8e992 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -505,8 +505,6 @@
     <ignore name="avahi"/>
     <package name="aaa_base" replaces="fprintd"/>
     <ignore name="fprintd"/>
-    <package name="aaa_base" replaces="accountsservice"/>
-    <ignore name="accountsservice"/>
     <package name="aaa_base" replaces="MozillaFirefox"/>
     <ignore name="MozillaFirefox"/>
     <package name="aaa_base" replaces="tcpdump"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 85aef6b..4fbbe3a 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 14 20:09:45 UTC 2023 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- list-x11: no longer block accountsservice: it is now a dependency
+  of xfce4-panel.
+
 -------------------------------------------------------------------
 Fri Jun 23 08:57:38 UTC 2023 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index ddf77cc..343c719 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -505,8 +505,6 @@
     <ignore name="avahi"/>
     <package name="aaa_base" replaces="fprintd"/>
     <ignore name="fprintd"/>
-    <package name="aaa_base" replaces="accountsservice"/>
-    <ignore name="accountsservice"/>
     <package name="aaa_base" replaces="MozillaFirefox"/>
     <ignore name="MozillaFirefox"/>
     <package name="aaa_base" replaces="tcpdump"/>

From bed285aa395b0514bd9a0f8f0411ed90c87f76664e5771598b04e2d1f66dc584 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Tue, 7 Nov 2023 10:16:51 +0000
Subject: [PATCH 2/2] Accepting request 1123857 from
 home:favogt:branches:openSUSE:Factory:Live

- list-common: Ignore xorg-x11-fonts-converted

OBS-URL: https://build.opensuse.org/request/show/1123857
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=153
---
 list-common.sh               | 2 ++
 livecd-leap-gnome.kiwi       | 2 ++
 livecd-leap-kde.kiwi         | 2 ++
 livecd-leap-x11.kiwi         | 2 ++
 livecd-leap-xfce.kiwi        | 2 ++
 livecd-openSUSE.changes      | 5 +++++
 livecd-tumbleweed-gnome.kiwi | 2 ++
 livecd-tumbleweed-kde.kiwi   | 2 ++
 livecd-tumbleweed-x11.kiwi   | 2 ++
 livecd-tumbleweed-xfce.kiwi  | 2 ++
 10 files changed, 23 insertions(+)

diff --git a/list-common.sh b/list-common.sh
index ba928e6..673576e 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -102,6 +102,8 @@ buildignore intlfonts-chinese-big-bitmap-fonts
 # Needed by GDM on Leap 15.5 for some weird reason (bsc#1203966)
 # buildignore xorg-x11-fonts
 buildignore xorg-x11-fonts-legacy
+# Only needed if something explicitly uses the ancient fonts
+buildignore xorg-x11-fonts-converted
 
 buildignore strace
 buildignore tcsh
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index d23f417..1feba01 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -224,6 +224,8 @@
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
     <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
     <ignore name="xorg-x11-fonts-legacy"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <ignore name="xorg-x11-fonts-converted"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 8ef3d24..8a99fc9 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -224,6 +224,8 @@
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
     <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
     <ignore name="xorg-x11-fonts-legacy"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <ignore name="xorg-x11-fonts-converted"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 7a8e992..94573f4 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -224,6 +224,8 @@
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
     <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
     <ignore name="xorg-x11-fonts-legacy"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <ignore name="xorg-x11-fonts-converted"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index 566b2db..5ab636a 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -224,6 +224,8 @@
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
     <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
     <ignore name="xorg-x11-fonts-legacy"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <ignore name="xorg-x11-fonts-converted"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 4fbbe3a..429d3c1 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov  7 09:36:40 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- list-common: Ignore xorg-x11-fonts-converted
+
 -------------------------------------------------------------------
 Thu Sep 14 20:09:45 UTC 2023 - Dominique Leuenberger <dleuenberger@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 7f6e451..b01541d 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -224,6 +224,8 @@
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
     <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
     <ignore name="xorg-x11-fonts-legacy"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <ignore name="xorg-x11-fonts-converted"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 72c89ef..48f63d7 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -224,6 +224,8 @@
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
     <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
     <ignore name="xorg-x11-fonts-legacy"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <ignore name="xorg-x11-fonts-converted"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 343c719..0adc561 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -224,6 +224,8 @@
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
     <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
     <ignore name="xorg-x11-fonts-legacy"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <ignore name="xorg-x11-fonts-converted"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 83d0195..1a37b64 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -224,6 +224,8 @@
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
     <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
     <ignore name="xorg-x11-fonts-legacy"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <ignore name="xorg-x11-fonts-converted"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>