From 055b78db8f0f3ca24f641219e1529a55c2dfbd62ee844975a00882ed307c080b Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Wed, 3 Aug 2022 05:54:09 +0000
Subject: [PATCH] - Adjust GNOME ignore list: google-noto- font packages were
 renamed   to include the google- prefix.

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=186
---
 list-gnome.sh                | 18 +++++++++---------
 livecd-leap-gnome.kiwi       | 36 ++++++++++++++++++------------------
 livecd-openSUSE.changes      |  6 ++++++
 livecd-tumbleweed-gnome.kiwi | 36 ++++++++++++++++++------------------
 4 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/list-gnome.sh b/list-gnome.sh
index 9fce61a..e290125 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -14,15 +14,15 @@ install adobe-sourcecodepro-fonts
 
 buildignore google-carlito-fonts
 buildignore noto-sans-fonts
-buildignore noto-sans-cjk-fonts
-buildignore noto-sans-sc-bold-fonts
-buildignore noto-sans-sc-regular-fonts
-buildignore noto-sans-tc-bold-fonts
-buildignore noto-sans-tc-regular-fonts
-buildignore noto-sans-jp-bold-fonts
-buildignore noto-sans-jp-regular-fonts
-buildignore noto-sans-kr-bold-fonts
-buildignore noto-sans-kr-regular-fonts
+buildignore google-noto-sans-cjk-fonts
+buildignore google-noto-sans-sc-bold-fonts
+buildignore google-noto-sans-sc-regular-fonts
+buildignore google-noto-sans-tc-bold-fonts
+buildignore google-noto-sans-tc-regular-fonts
+buildignore google-noto-sans-jp-bold-fonts
+buildignore google-noto-sans-jp-regular-fonts
+buildignore google-noto-sans-kr-bold-fonts
+buildignore google-noto-sans-kr-regular-fonts
 
 # Expected by openQA - But no more space on the CD
 # install libreoffice-writer
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index aa1315e..4ff1311 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -465,24 +465,24 @@
     <ignore name="google-carlito-fonts"/>
     <package name="aaa_base" replaces="noto-sans-fonts"/>
     <ignore name="noto-sans-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
-    <ignore name="noto-sans-cjk-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-sc-bold-fonts"/>
-    <ignore name="noto-sans-sc-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-sc-regular-fonts"/>
-    <ignore name="noto-sans-sc-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-tc-bold-fonts"/>
-    <ignore name="noto-sans-tc-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-tc-regular-fonts"/>
-    <ignore name="noto-sans-tc-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-jp-bold-fonts"/>
-    <ignore name="noto-sans-jp-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-jp-regular-fonts"/>
-    <ignore name="noto-sans-jp-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-kr-bold-fonts"/>
-    <ignore name="noto-sans-kr-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-kr-regular-fonts"/>
-    <ignore name="noto-sans-kr-regular-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-cjk-fonts"/>
+    <ignore name="google-noto-sans-cjk-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-sc-bold-fonts"/>
+    <ignore name="google-noto-sans-sc-bold-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-sc-regular-fonts"/>
+    <ignore name="google-noto-sans-sc-regular-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-tc-bold-fonts"/>
+    <ignore name="google-noto-sans-tc-bold-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-tc-regular-fonts"/>
+    <ignore name="google-noto-sans-tc-regular-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-jp-bold-fonts"/>
+    <ignore name="google-noto-sans-jp-bold-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-jp-regular-fonts"/>
+    <ignore name="google-noto-sans-jp-regular-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-kr-bold-fonts"/>
+    <ignore name="google-noto-sans-kr-bold-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-kr-regular-fonts"/>
+    <ignore name="google-noto-sans-kr-regular-fonts"/>
     <package name="aaa_base" replaces="libreoffice"/>
     <ignore name="libreoffice"/>
     <package name="live-net-installer"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 3cebdd5..2d82951 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug  3 05:53:28 UTC 2022 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Adjust GNOME ignore list: google-noto- font packages were renamed
+  to include the google- prefix.
+
 -------------------------------------------------------------------
 Wed Jul 27 06:25:00 UTC 2022 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index d844791..a4a7eac 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -459,24 +459,24 @@
     <ignore name="google-carlito-fonts"/>
     <package name="aaa_base" replaces="noto-sans-fonts"/>
     <ignore name="noto-sans-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
-    <ignore name="noto-sans-cjk-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-sc-bold-fonts"/>
-    <ignore name="noto-sans-sc-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-sc-regular-fonts"/>
-    <ignore name="noto-sans-sc-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-tc-bold-fonts"/>
-    <ignore name="noto-sans-tc-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-tc-regular-fonts"/>
-    <ignore name="noto-sans-tc-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-jp-bold-fonts"/>
-    <ignore name="noto-sans-jp-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-jp-regular-fonts"/>
-    <ignore name="noto-sans-jp-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-kr-bold-fonts"/>
-    <ignore name="noto-sans-kr-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-kr-regular-fonts"/>
-    <ignore name="noto-sans-kr-regular-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-cjk-fonts"/>
+    <ignore name="google-noto-sans-cjk-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-sc-bold-fonts"/>
+    <ignore name="google-noto-sans-sc-bold-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-sc-regular-fonts"/>
+    <ignore name="google-noto-sans-sc-regular-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-tc-bold-fonts"/>
+    <ignore name="google-noto-sans-tc-bold-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-tc-regular-fonts"/>
+    <ignore name="google-noto-sans-tc-regular-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-jp-bold-fonts"/>
+    <ignore name="google-noto-sans-jp-bold-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-jp-regular-fonts"/>
+    <ignore name="google-noto-sans-jp-regular-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-kr-bold-fonts"/>
+    <ignore name="google-noto-sans-kr-bold-fonts"/>
+    <package name="aaa_base" replaces="google-noto-sans-kr-regular-fonts"/>
+    <ignore name="google-noto-sans-kr-regular-fonts"/>
     <package name="aaa_base" replaces="libreoffice"/>
     <ignore name="libreoffice"/>
     <package name="live-net-installer"/>