diff --git a/list-common.sh b/list-common.sh index 5bc305f..f1d9fbf 100644 --- a/list-common.sh +++ b/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 diff --git a/list-kde.sh b/list-kde.sh index 612ee6b..023a29f 100644 --- a/list-kde.sh +++ b/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 diff --git a/list-x11.sh b/list-x11.sh index ebb70c1..3598a1a 100644 --- a/list-x11.sh +++ b/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 diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index 7dc591b..22635e2 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -215,6 +215,8 @@ + + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index 156ccdb..73c51ee 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -215,6 +215,8 @@ + + @@ -437,8 +439,6 @@ - - diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 8485dda..ae11708 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -215,6 +215,8 @@ + + @@ -466,8 +468,6 @@ - - diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 20d9dd9..c49f08a 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 17 09:25:33 UTC 2020 - Fabian Vogt + +- 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 diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index 1e7be65..946c4c4 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -215,6 +215,8 @@ + + diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index 3730c1a..6bd2a90 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -215,6 +215,8 @@ + + @@ -437,8 +439,6 @@ - - diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index 41beb9c..bb3d997 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -215,6 +215,8 @@ + + @@ -466,8 +468,6 @@ - - diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index 478dc5c..a427b0c 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -215,6 +215,8 @@ + + diff --git a/pkg-diff.sh b/pkg-diff.sh index 99576b2..281e117 100644 --- a/pkg-diff.sh +++ b/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)