- list-common: Ignore xorg-x11-fonts, LO no longer needs it

- pkg-diff.sh: Also compare versions

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=72

list-common.sh

@@ -94,6 +94,7 @@ buildignore google-droid-fonts
 buildignore efont-unicode-bitmap-fonts
 buildignore baekmuk-bitmap-fonts
 buildignore intlfonts-chinese-big-bitmap-fonts
+buildignore xorg-x11-fonts
 
 buildignore strace
 buildignore tcsh

list-kde.sh

@@ -19,8 +19,6 @@ install NetworkManager
 buildignore libreoffice
 buildignore libreoffice-icon-themes
 buildignore libreoffice-icon-theme-breeze
-# Required by LO, but otherwise too large
-buildignore xorg-x11-fonts
 buildignore kdenetwork4-filesharing
 buildignore gnome-keyring
 

list-x11.sh

@@ -30,7 +30,6 @@ buildignore ImageMagick
 buildignore awesfx
 buildignore sbl
 buildignore gnome-online-accounts
-buildignore xorg-x11-fonts
 buildignore snapper
 
 buildignore Mesa-libva

livecd-leap-gnome.kiwi

@@ -215,6 +215,8 @@
     <ignore name="baekmuk-bitmap-fonts"/>
     <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <ignore name="xorg-x11-fonts"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>

livecd-leap-kde.kiwi

@@ -215,6 +215,8 @@
     <ignore name="baekmuk-bitmap-fonts"/>
     <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <ignore name="xorg-x11-fonts"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>
@@ -437,8 +439,6 @@
     <ignore name="libreoffice-icon-themes"/>
     <package name="aaa_base" replaces="libreoffice-icon-theme-breeze"/>
     <ignore name="libreoffice-icon-theme-breeze"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts"/>
-    <ignore name="xorg-x11-fonts"/>
     <package name="aaa_base" replaces="kdenetwork4-filesharing"/>
     <ignore name="kdenetwork4-filesharing"/>
     <package name="aaa_base" replaces="gnome-keyring"/>

livecd-leap-x11.kiwi

@@ -215,6 +215,8 @@
     <ignore name="baekmuk-bitmap-fonts"/>
     <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <ignore name="xorg-x11-fonts"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>
@@ -466,8 +468,6 @@
     <ignore name="sbl"/>
     <package name="aaa_base" replaces="gnome-online-accounts"/>
     <ignore name="gnome-online-accounts"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts"/>
-    <ignore name="xorg-x11-fonts"/>
     <package name="aaa_base" replaces="snapper"/>
     <ignore name="snapper"/>
     <package name="aaa_base" replaces="Mesa-libva"/>

livecd-openSUSE.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 17 09:25:33 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- list-common: Ignore xorg-x11-fonts, LO no longer needs it
+- pkg-diff.sh: Also compare versions
+
 -------------------------------------------------------------------
 Wed Apr  8 10:19:06 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
 

livecd-tumbleweed-gnome.kiwi

@@ -215,6 +215,8 @@
     <ignore name="baekmuk-bitmap-fonts"/>
     <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <ignore name="xorg-x11-fonts"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>

livecd-tumbleweed-kde.kiwi

@@ -215,6 +215,8 @@
     <ignore name="baekmuk-bitmap-fonts"/>
     <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <ignore name="xorg-x11-fonts"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>
@@ -437,8 +439,6 @@
     <ignore name="libreoffice-icon-themes"/>
     <package name="aaa_base" replaces="libreoffice-icon-theme-breeze"/>
     <ignore name="libreoffice-icon-theme-breeze"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts"/>
-    <ignore name="xorg-x11-fonts"/>
     <package name="aaa_base" replaces="kdenetwork4-filesharing"/>
     <ignore name="kdenetwork4-filesharing"/>
     <package name="aaa_base" replaces="gnome-keyring"/>

livecd-tumbleweed-x11.kiwi

@@ -215,6 +215,8 @@
     <ignore name="baekmuk-bitmap-fonts"/>
     <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <ignore name="xorg-x11-fonts"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>
@@ -466,8 +468,6 @@
     <ignore name="sbl"/>
     <package name="aaa_base" replaces="gnome-online-accounts"/>
     <ignore name="gnome-online-accounts"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts"/>
-    <ignore name="xorg-x11-fonts"/>
     <package name="aaa_base" replaces="snapper"/>
     <ignore name="snapper"/>
     <package name="aaa_base" replaces="Mesa-libva"/>

livecd-tumbleweed-xfce.kiwi

@@ -215,6 +215,8 @@
     <ignore name="baekmuk-bitmap-fonts"/>
     <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
+    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <ignore name="xorg-x11-fonts"/>
     <package name="aaa_base" replaces="strace"/>
     <ignore name="strace"/>
     <package name="aaa_base" replaces="tcsh"/>

pkg-diff.sh

@@ -14,7 +14,7 @@ fetch_pkglist() {
 	local arch=$4
 	local binaryname=$(osc ls -b ${project} ${package} -a ${arch} -r ${repo} | grep .packages | xargs)
 
-	osc api /build/${project}/${repo}/${arch}/${package}/${binaryname} | awk -F\| '{ print $1 }' | sort -u
+	osc api /build/${project}/${repo}/${arch}/${package}/${binaryname} | awk -F\| '{ print printf "%s-%s-%s\n", $1, $3, $4 }' | sort -u
 }
 
 tmpdir=$(mktemp -d)