Accepting request 741737 from Virtualization:Appliances:Images:openSUSE-Tumbleweed

- list-x11: Block libpeas-loader-python to avoid libpython2_7
- Fix pkg-diff for prjs with multiple repos
- Move xf86-video-vmware from list-common to list-{gnome,kde,xfce} (forwarded request 741736 from favogt)

OBS-URL: https://build.opensuse.org/request/show/741737
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=77

list-common.sh

@@ -263,7 +263,6 @@ install xf86-video-tdfx
 install xf86-video-tga
 install xf86-video-v4l
 install xf86-video-vesa
-install xf86-video-vmware i686,x86_64
 install xf86-video-voodoo
 install xfsdump
 install xfsprogs

list-gnome.sh

@@ -78,6 +78,9 @@ buildignore fwupd-lang
 # Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD
 buildignore cyrus-sasl
 
+# Moved here from list-common.sh, too big for x11
+install xf86-video-vmware i686,x86_64
+
 # From rest_cd_core
 install alsa-firmware
 

list-kde.sh

@@ -43,6 +43,9 @@ buildignore patterns-kde-kde_games
 buildignore patterns-kde-kde_utilities
 install kcharselect
 
+# Moved here from list-common.sh, too big for x11
+install xf86-video-vmware i686,x86_64
+
 # No PIM
 buildignore patterns-kde-kde_pim
 

list-x11.sh

@@ -33,6 +33,9 @@ buildignore Mesa-libva
 # No python2 necessary
 buildignore python-base
 
+# Pulls in libpython2_7
+buildignore libpeas-loader-python
+
 buildignore aspell-en
 buildignore ModemManager
 buildignore yast2-printer

list-xfce.sh

@@ -33,6 +33,9 @@ buildignore libreoffice
 # Pulls in sane-backends
 buildignore simple-scan
 
+# Moved here from list-common.sh, too big for x11
+install xf86-video-vmware i686,x86_64
+
 # make sure pdf support for xreader is installed
 install xreader-plugin-pdfdocument
 

livecd-leap-gnome.kiwi

@@ -382,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -514,6 +513,7 @@
     <ignore name="fwupd-lang"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="alsa-firmware"/>
     <namedCollection name="apparmor"/>
     <namedCollection name="games"/>

livecd-leap-kde.kiwi

@@ -382,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -475,6 +474,7 @@
     <package name="aaa_base" replaces="patterns-kde-kde_utilities"/>
     <ignore name="patterns-kde-kde_utilities"/>
     <package name="kcharselect"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="aaa_base" replaces="patterns-kde-kde_pim"/>
     <ignore name="patterns-kde-kde_pim"/>
     <package name="aaa_base" replaces="gdb"/>

livecd-leap-x11.kiwi

@@ -382,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -472,6 +471,8 @@
     <ignore name="Mesa-libva"/>
     <package name="aaa_base" replaces="python-base"/>
     <ignore name="python-base"/>
+    <package name="aaa_base" replaces="libpeas-loader-python"/>
+    <ignore name="libpeas-loader-python"/>
     <package name="aaa_base" replaces="aspell-en"/>
     <ignore name="aspell-en"/>
     <package name="aaa_base" replaces="ModemManager"/>

livecd-openSUSE.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 22 08:40:15 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- list-x11: Block libpeas-loader-python to avoid libpython2_7
+- Fix pkg-diff for prjs with multiple repos
+- Move xf86-video-vmware from list-common to list-{gnome,kde,xfce}
+
 -------------------------------------------------------------------
 Mon Sep 30 09:08:32 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
 

livecd-tumbleweed-gnome.kiwi

@@ -382,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -514,6 +513,7 @@
     <ignore name="fwupd-lang"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="alsa-firmware"/>
     <namedCollection name="apparmor"/>
     <namedCollection name="games"/>

livecd-tumbleweed-kde.kiwi

@@ -382,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -475,6 +474,7 @@
     <package name="aaa_base" replaces="patterns-kde-kde_utilities"/>
     <ignore name="patterns-kde-kde_utilities"/>
     <package name="kcharselect"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="aaa_base" replaces="patterns-kde-kde_pim"/>
     <ignore name="patterns-kde-kde_pim"/>
     <package name="aaa_base" replaces="gdb"/>

livecd-tumbleweed-x11.kiwi

@@ -382,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -472,6 +471,8 @@
     <ignore name="Mesa-libva"/>
     <package name="aaa_base" replaces="python-base"/>
     <ignore name="python-base"/>
+    <package name="aaa_base" replaces="libpeas-loader-python"/>
+    <ignore name="libpeas-loader-python"/>
     <package name="aaa_base" replaces="aspell-en"/>
     <ignore name="aspell-en"/>
     <package name="aaa_base" replaces="ModemManager"/>

livecd-tumbleweed-xfce.kiwi

@@ -382,7 +382,6 @@
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
@@ -462,6 +461,7 @@
     <ignore name="libreoffice"/>
     <package name="aaa_base" replaces="simple-scan"/>
     <ignore name="simple-scan"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xreader-plugin-pdfdocument"/>
     <package name="alsa-firmware"/>
     <package name="opensuse-welcome"/>

pkg-diff.sh

@@ -12,7 +12,7 @@ fetch_pkglist() {
 	local package=$2
 	local repo=$3
 	local arch=$4
-	local binaryname=$(osc ls -b ${project} ${package} -a ${arch} | grep .packages | xargs)
+	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
 }