From 66373330077f9c8176a51cbdd33eab66c73a455d33ae3f58691bfaad685d3977 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 3 Aug 2022 05:54:09 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/livecd-openSUSE revision 186.0 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=8cace5ae0f0f412bdd31d4edfe3d7f76 --- 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 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + 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 + +- 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 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 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + From d66ac1c12d5ffd0eeec41304f7929d525ce3ddc536546a07482e32d1b773eb50 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 8 Aug 2022 08:25:29 +0000 Subject: [PATCH 2/2] Accepting request 993706 from home:favogt:branches:openSUSE:Factory:Live - Delete xorg-x11-server-Xvfb only if installed - Make list-gnome compatible with Leap again - Don't ignore alsa-plugins-pulse anymore, no longer needed - Raise disk size constraint to 20GiB to fix occasional build failures OBS-URL: https://build.opensuse.org/request/show/993706 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=135 --- _constraints | 2 +- config.sh | 4 +++- list-common.sh | 3 --- list-gnome.sh | 23 +++++++++++++---------- livecd-leap-gnome.kiwi | 26 ++++++++++++++++++++++---- livecd-leap-kde.kiwi | 2 -- livecd-leap-x11.kiwi | 2 -- livecd-leap-xfce.kiwi | 2 -- livecd-openSUSE.changes | 8 ++++++++ livecd-tumbleweed-gnome.kiwi | 26 ++++++++++++++++++++++---- livecd-tumbleweed-kde.kiwi | 2 -- livecd-tumbleweed-x11.kiwi | 2 -- livecd-tumbleweed-xfce.kiwi | 2 -- 13 files changed, 69 insertions(+), 35 deletions(-) diff --git a/_constraints b/_constraints index c0d137a..07622cf 100644 --- a/_constraints +++ b/_constraints @@ -1,7 +1,7 @@ - 18 + 20 diff --git a/config.sh b/config.sh index 421e062..4de6b28 100644 --- a/config.sh +++ b/config.sh @@ -36,7 +36,9 @@ rpm -qa | grep "^libisl" | xargs -r rpm -e # Workaround until dropped from xfce4-branding-openSUSE if [ "$desktop" = "x11" -o "$desktop" = "xfce" ]; then - rpm -e --nodeps xorg-x11-server-Xvfb + if rpm -q xorg-x11-server-Xvfb; then + rpm -e --nodeps xorg-x11-server-Xvfb + fi rpm -e --nodeps noto-coloremoji-fonts || rpm -e --nodeps google-noto-coloremoji-fonts fi diff --git a/list-common.sh b/list-common.sh index 72cd8bc..d2d5a40 100644 --- a/list-common.sh +++ b/list-common.sh @@ -317,6 +317,3 @@ install zip # Workaround for bsc#1131492 buildignore ntp - -# ignore alsa-plugins-pulse for noe -buildignore alsa-plugins-pulse diff --git a/list-gnome.sh b/list-gnome.sh index e290125..a7d90e1 100644 --- a/list-gnome.sh +++ b/list-gnome.sh @@ -13,16 +13,19 @@ install branding-openSUSE install adobe-sourcecodepro-fonts buildignore google-carlito-fonts -buildignore noto-sans-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 +# Was renamed in TW +for prefix in google- ""; do + buildignore ${prefix}noto-sans-fonts + buildignore ${prefix}noto-sans-cjk-fonts + buildignore ${prefix}noto-sans-sc-bold-fonts + buildignore ${prefix}noto-sans-sc-regular-fonts + buildignore ${prefix}noto-sans-tc-bold-fonts + buildignore ${prefix}noto-sans-tc-regular-fonts + buildignore ${prefix}noto-sans-jp-bold-fonts + buildignore ${prefix}noto-sans-jp-regular-fonts + buildignore ${prefix}noto-sans-kr-bold-fonts + buildignore ${prefix}noto-sans-kr-regular-fonts +done # 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 4ff1311..64ef5d7 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -437,8 +437,6 @@ - - @@ -463,8 +461,8 @@ - - + + @@ -483,6 +481,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index ea0c514..76de0dd 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -437,8 +437,6 @@ - - diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 68b792b..e395b87 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -437,8 +437,6 @@ - - diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi index f94c9d6..ab0e303 100644 --- a/livecd-leap-xfce.kiwi +++ b/livecd-leap-xfce.kiwi @@ -437,8 +437,6 @@ - - diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 2d82951..4a4fba3 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Aug 8 07:51:52 UTC 2022 - Fabian Vogt + +- Delete xorg-x11-server-Xvfb only if installed +- Make list-gnome compatible with Leap again +- Don't ignore alsa-plugins-pulse anymore, no longer needed +- Raise disk size constraint to 20GiB to fix occasional build failures + ------------------------------------------------------------------- Wed Aug 3 05:53:28 UTC 2022 - Dominique Leuenberger diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index a4a7eac..8fe7991 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -431,8 +431,6 @@ - - @@ -457,8 +455,8 @@ - - + + @@ -477,6 +475,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index c89aec3..5e580ca 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -431,8 +431,6 @@ - - diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index 2af2b03..a5f6a41 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -431,8 +431,6 @@ - - diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index 8ab62b0..117f0e4 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -431,8 +431,6 @@ - -