From 211f581300a0420d1a695bdd5288c3f18e475c91 Mon Sep 17 00:00:00 2001
From: staging-bot <>
Date: May 21 2021 11:26:27 +0000
Subject: Update 000release-packages to rev 991


https://build.opensuse.org/package/rdiff/openSUSE:Factory/000release-packages?linkrev=base&rev=991
by user staging-bot
Automatic update

---

diff --git a/.rev b/.rev
index 109248a..60f4939 100644
--- a/.rev
+++ b/.rev
@@ -6846,6 +6846,7 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
+<<<<<<< Updated upstream
   <revision rev="979" vrev="979">
     <srcmd5>9207c81a2daca42dd4284fc5e24b0de5</srcmd5>
     <version>unknown</version>
@@ -6937,4 +6938,6 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
+=======
+>>>>>>> Stashed changes
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index cfe1dfa..fcc64e9 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1,5 @@
+<<<<<<< Updated upstream
 890017e157358ab173554a1c0574f4d2
+=======
+ef63c03f7bf1f6f446e8ce506f3994f8
+>>>>>>> Stashed changes
diff --git a/MicroOS-release.spec b/MicroOS-release.spec
index e8fd3fb..df62ee0 100644
--- a/MicroOS-release.spec
+++ b/MicroOS-release.spec
@@ -17,7 +17,11 @@
 
 
 Name:           MicroOS-release
+<<<<<<< Updated upstream
 Version:        20210520
+=======
+Version:        20210510
+>>>>>>> Stashed changes
 Release:        0
 Summary:        openSUSE MicroOS 
 License:        GPL-2.0-or-later
@@ -176,9 +180,15 @@ ExclusiveArch:  %ix86 x86_64 ppc64le s390x aarch64 %arm
 %include %{SOURCE100}
 Provides:       %name-%version
 Provides:       product() = MicroOS
+<<<<<<< Updated upstream
 Provides:       product(MicroOS) = 20210520-0
 Provides:       product-label() = openSUSE%20MicroOS
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210520
+=======
+Provides:       product(MicroOS) = 20210510-0
+Provides:       product-label() = openSUSE%20MicroOS
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210510
+>>>>>>> Stashed changes
 Provides:       product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
 Provides:       product-endoflife()
 Requires:       product_flavor(MicroOS)
@@ -194,7 +204,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210520-0
+=======
+Provides:       product_flavor(MicroOS) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -210,7 +224,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(kubic-dvd)
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210520-0
+=======
+Provides:       product_flavor(MicroOS) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description kubic-dvd
@@ -226,7 +244,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance)
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210520-0
+=======
+Provides:       product_flavor(MicroOS) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -242,7 +264,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-kubic)
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210520-0
+=======
+Provides:       product_flavor(MicroOS) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance-kubic
@@ -301,11 +327,19 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>MicroOS</name>
+<<<<<<< Updated upstream
   <version>20210520</version>
   <release>0</release>
   <endoflife></endoflife>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:microos:20210520</cpeid>
+=======
+  <version>20210510</version>
+  <release>0</release>
+  <endoflife></endoflife>
+  <arch>%{_target_cpu}</arch>
+  <cpeid>cpe:/o:opensuse:microos:20210510</cpeid>
+>>>>>>> Stashed changes
   <productline>MicroOS</productline>
   <register>
     <pool>
diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec
index c737f73..fc2621e 100644
--- a/openSUSE-Addon-NonOss-release.spec
+++ b/openSUSE-Addon-NonOss-release.spec
@@ -1,5 +1,9 @@
 #
+<<<<<<< Updated upstream
 # spec file for package openSUSE-Addon-NonOss-release (Version 20210520)
+=======
+# spec file for package openSUSE-Addon-NonOss-release (Version 20210510)
+>>>>>>> Stashed changes
 #
 # Copyright (c) 2021 openSUSE.
 #
@@ -16,16 +20,26 @@
 Name:           openSUSE-Addon-NonOss-release
 %define         product openSUSE-Addon-NonOss
 Summary:        openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
+<<<<<<< Updated upstream
 Version:        20210520
+=======
+Version:        20210510
+>>>>>>> Stashed changes
 Release:        0
 License:        BSD-3-Clause
 Group:          System/Fhs
 
 Provides:       %name-%version
 Provides:       product() = openSUSE-Addon-NonOss
+<<<<<<< Updated upstream
 Provides:       product(openSUSE-Addon-NonOss) = 20210520-0
 Provides:       product-label() = non%20oss%20addon
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210520
+=======
+Provides:       product(openSUSE-Addon-NonOss) = 20210510-0
+Provides:       product-label() = non%20oss%20addon
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210510
+>>>>>>> Stashed changes
 
 
 AutoReqProv:    on
@@ -49,10 +63,17 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>openSUSE-Addon-NonOss</name>
+<<<<<<< Updated upstream
   <version>20210520</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210520</cpeid>
+=======
+  <version>20210510</version>
+  <release>0</release>
+  <arch>%{_target_cpu}</arch>
+  <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210510</cpeid>
+>>>>>>> Stashed changes
   <register>
     <pool>
     </pool>
diff --git a/openSUSE-release.spec b/openSUSE-release.spec
index 6e9192a..97d4280 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -20,7 +20,11 @@
 #define betaversion %{nil}
 %define codename Tumbleweed
 Name:           openSUSE-release
+<<<<<<< Updated upstream
 Version:        20210520
+=======
+Version:        20210510
+>>>>>>> Stashed changes
 Release:        0
 # 0 is the product release, not the build release of this package
 Summary:        openSUSE Tumbleweed
@@ -178,7 +182,11 @@ Provides:       weakremover(openssl-debuginfo)
 %include %{SOURCE100}
 Provides:       %name-%version
 Provides:       product() = openSUSE
+<<<<<<< Updated upstream
 Provides:       product(openSUSE) = 20210520-0
+=======
+Provides:       product(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 %ifarch x86_64
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
 %endif
@@ -192,7 +200,11 @@ Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dppc64le
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Daarch64
 %endif
 Provides:       product-label() = openSUSE
+<<<<<<< Updated upstream
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210520
+=======
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210510
+>>>>>>> Stashed changes
 Provides:       product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
 Provides:       product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
 Requires:       product_flavor(openSUSE)
@@ -206,7 +218,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(ftp)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description ftp
@@ -221,7 +237,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(mini)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description mini
@@ -236,7 +256,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -251,7 +275,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-kde)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-kde
@@ -266,7 +294,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-x11)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-x11
@@ -281,7 +313,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-gnome)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-gnome
@@ -296,7 +332,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-xfce)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-xfce
@@ -311,7 +351,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-kde)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-kde
@@ -326,7 +370,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-gnome)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-gnome
@@ -341,7 +389,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-x11)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-x11
@@ -356,7 +408,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -371,7 +427,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-docker)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-docker
@@ -386,7 +446,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-kvm)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-kvm
@@ -401,7 +465,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-vmware)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vmware
@@ -416,7 +484,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-openstack)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-openstack
@@ -431,7 +503,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-hyperv)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-hyperv
@@ -446,7 +522,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-vagrant)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vagrant
@@ -461,7 +541,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-wsl)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-wsl
@@ -476,7 +560,11 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-custom)
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-custom
@@ -551,10 +639,17 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>openSUSE</name>
+<<<<<<< Updated upstream
   <version>20210520</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:opensuse:20210520</cpeid>
+=======
+  <version>20210510</version>
+  <release>0</release>
+  <arch>%{_target_cpu}</arch>
+  <cpeid>cpe:/o:opensuse:opensuse:20210510</cpeid>
+>>>>>>> Stashed changes
   <productline>openSUSE</productline>
   <register>
     <pool>
diff --git a/weakremovers.inc b/weakremovers.inc
index d89d116..8aa8828 100644
--- a/weakremovers.inc
+++ b/weakremovers.inc
@@ -4120,6 +4120,7 @@ Provides: weakremover(cmpi-pywbem-base)
 Provides: weakremover(cmpi-pywbem-power-management)
 Provides: weakremover(cmpi-pywbem-software)
 Provides: weakremover(cobbler-web)
+Provides: weakremover(cockpit-machines)
 Provides: weakremover(collectd-plugin-lvm)
 Provides: weakremover(collectd-plugin-python)
 Provides: weakremover(colorblind-devel)
@@ -27842,6 +27843,8 @@ Provides: weakremover(xmonad)
 %ifarch x86_64
 Provides: weakremover(96BoardsGPIO-common)
 Provides: weakremover(96BoardsGPIO-devel)
+Provides: weakremover(Mesa-vulkan-device-select-32bit)
+Provides: weakremover(Mesa-vulkan-overlay-32bit)
 Provides: weakremover(SVT-AV1)
 Provides: weakremover(SVT-AV1-devel)
 Provides: weakremover(allegro-dga2-plugin-32bit)