From 33ecd1a2ef0b62ea9d46a07940d5f7ee783c4b61 Mon Sep 17 00:00:00 2001
From: staging-bot <>
Date: May 09 2021 17:26:27 +0000
Subject: Update 000release-packages to rev 975


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

---

diff --git a/.rev b/.rev
index c5a7d30..eee5f54 100644
--- a/.rev
+++ b/.rev
@@ -6812,7 +6812,10 @@
     <comment>Automatic update</comment>
   </revision>
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+=======
 =======
+>>>>>>> Stashed changes
   <revision rev="974" vrev="974">
     <srcmd5>205643fd1c037f6e2941fea90b1b5383</srcmd5>
     <version>unknown</version>
@@ -6820,5 +6823,15 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+  <revision rev="975" vrev="975">
+    <srcmd5>7855cb2000221cbee5308ae47bdecac3</srcmd5>
+    <version>unknown</version>
+    <time>1620580951</time>
+    <user>staging-bot</user>
+    <comment>Automatic update</comment>
+  </revision>
 >>>>>>> Stashed changes
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index 35cae78..d065d94 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1,5 +1,9 @@
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 8974c5e31f55a0c863cce2a213e80ea1
 =======
 cc4598d1611e7429d4cbcd1a6e0e73e7
 >>>>>>> Stashed changes
+=======
+eb97875a5ed70118fda5b31fc2b1e450
+>>>>>>> Stashed changes
diff --git a/MicroOS-release.spec b/MicroOS-release.spec
index 19cf779..bd45739 100644
--- a/MicroOS-release.spec
+++ b/MicroOS-release.spec
@@ -18,10 +18,14 @@
 
 Name:           MicroOS-release
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Version:        20210507
 =======
 Version:        20210508
 >>>>>>> Stashed changes
+=======
+Version:        20210508
+>>>>>>> Stashed changes
 Release:        0
 Summary:        openSUSE MicroOS 
 License:        GPL-2.0-or-later
@@ -181,6 +185,7 @@ ExclusiveArch:  %ix86 x86_64 ppc64le s390x aarch64 %arm
 Provides:       %name-%version
 Provides:       product() = MicroOS
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product(MicroOS) = 20210507-0
 Provides:       product-label() = openSUSE%20MicroOS
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210507
@@ -189,6 +194,11 @@ Provides:       product(MicroOS) = 20210508-0
 Provides:       product-label() = openSUSE%20MicroOS
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210508
 >>>>>>> Stashed changes
+=======
+Provides:       product(MicroOS) = 20210508-0
+Provides:       product-label() = openSUSE%20MicroOS
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210508
+>>>>>>> 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)
@@ -205,10 +215,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -225,10 +239,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(kubic-dvd)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description kubic-dvd
@@ -245,10 +263,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -265,10 +287,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-kubic)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance-kubic
@@ -328,17 +354,23 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
   <vendor>openSUSE</vendor>
   <name>MicroOS</name>
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
   <version>20210507</version>
   <release>0</release>
   <endoflife></endoflife>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:microos:20210507</cpeid>
 =======
+=======
+>>>>>>> Stashed changes
   <version>20210508</version>
   <release>0</release>
   <endoflife></endoflife>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:microos:20210508</cpeid>
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
   <productline>MicroOS</productline>
   <register>
diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec
index de03971..7ff4e62 100644
--- a/openSUSE-Addon-NonOss-release.spec
+++ b/openSUSE-Addon-NonOss-release.spec
@@ -1,9 +1,13 @@
 #
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 # spec file for package openSUSE-Addon-NonOss-release (Version 20210507)
 =======
 # spec file for package openSUSE-Addon-NonOss-release (Version 20210508)
 >>>>>>> Stashed changes
+=======
+# spec file for package openSUSE-Addon-NonOss-release (Version 20210508)
+>>>>>>> Stashed changes
 #
 # Copyright (c) 2021 openSUSE.
 #
@@ -21,10 +25,14 @@ Name:           openSUSE-Addon-NonOss-release
 %define         product openSUSE-Addon-NonOss
 Summary:        openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Version:        20210507
 =======
 Version:        20210508
 >>>>>>> Stashed changes
+=======
+Version:        20210508
+>>>>>>> Stashed changes
 Release:        0
 License:        BSD-3-Clause
 Group:          System/Fhs
@@ -32,6 +40,7 @@ Group:          System/Fhs
 Provides:       %name-%version
 Provides:       product() = openSUSE-Addon-NonOss
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product(openSUSE-Addon-NonOss) = 20210507-0
 Provides:       product-label() = non%20oss%20addon
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210507
@@ -40,6 +49,11 @@ Provides:       product(openSUSE-Addon-NonOss) = 20210508-0
 Provides:       product-label() = non%20oss%20addon
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210508
 >>>>>>> Stashed changes
+=======
+Provides:       product(openSUSE-Addon-NonOss) = 20210508-0
+Provides:       product-label() = non%20oss%20addon
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210508
+>>>>>>> Stashed changes
 
 
 AutoReqProv:    on
@@ -64,15 +78,21 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
   <vendor>openSUSE</vendor>
   <name>openSUSE-Addon-NonOss</name>
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
   <version>20210507</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210507</cpeid>
 =======
+=======
+>>>>>>> Stashed changes
   <version>20210508</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210508</cpeid>
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
   <register>
     <pool>
diff --git a/openSUSE-release.spec b/openSUSE-release.spec
index 87a5d8e..ec6ee0d 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -21,10 +21,14 @@
 %define codename Tumbleweed
 Name:           openSUSE-release
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Version:        20210507
 =======
 Version:        20210508
 >>>>>>> Stashed changes
+=======
+Version:        20210508
+>>>>>>> Stashed changes
 Release:        0
 # 0 is the product release, not the build release of this package
 Summary:        openSUSE Tumbleweed
@@ -183,10 +187,14 @@ Provides:       weakremover(openssl-debuginfo)
 Provides:       %name-%version
 Provides:       product() = openSUSE
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product(openSUSE) = 20210507-0
 =======
 Provides:       product(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 %ifarch x86_64
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
 %endif
@@ -201,10 +209,14 @@ Provides:       product-register-target() = openSUSE%2DTumbleweed%2Daarch64
 %endif
 Provides:       product-label() = openSUSE
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210507
 =======
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210508
 >>>>>>> Stashed changes
+=======
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210508
+>>>>>>> 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)
@@ -219,10 +231,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(ftp)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description ftp
@@ -238,10 +254,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(mini)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description mini
@@ -257,10 +277,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -276,10 +300,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-kde)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-kde
@@ -295,10 +323,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-x11)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-x11
@@ -314,10 +346,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-gnome)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-gnome
@@ -333,10 +369,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-xfce)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-xfce
@@ -352,10 +392,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-kde)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-kde
@@ -371,10 +415,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-gnome)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-gnome
@@ -390,10 +438,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-x11)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-x11
@@ -409,10 +461,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -428,10 +484,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-docker)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-docker
@@ -447,10 +507,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-kvm)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-kvm
@@ -466,10 +530,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-vmware)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vmware
@@ -485,10 +553,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-openstack)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-openstack
@@ -504,10 +576,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-hyperv)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-hyperv
@@ -523,10 +599,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-vagrant)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vagrant
@@ -542,10 +622,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-wsl)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-wsl
@@ -561,10 +645,14 @@ Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-custom)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-custom
@@ -640,6 +728,7 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
   <vendor>openSUSE</vendor>
   <name>openSUSE</name>
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
   <version>20210507</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
@@ -650,6 +739,12 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:opensuse:20210508</cpeid>
 >>>>>>> Stashed changes
+=======
+  <version>20210508</version>
+  <release>0</release>
+  <arch>%{_target_cpu}</arch>
+  <cpeid>cpe:/o:opensuse:opensuse:20210508</cpeid>
+>>>>>>> Stashed changes
   <productline>openSUSE</productline>
   <register>
     <pool>
diff --git a/weakremovers.inc b/weakremovers.inc
index fea9a36..b4b2203 100644
--- a/weakremovers.inc
+++ b/weakremovers.inc
@@ -9435,6 +9435,7 @@ Provides: weakremover(libVkLayer_utils-1_2_162_0)
 Provides: weakremover(libVkLayer_utils-1_2_162_1)
 Provides: weakremover(libVkLayer_utils-1_2_165)
 Provides: weakremover(libVkLayer_utils-1_2_166)
+Provides: weakremover(libVkLayer_utils-1_2_170_0)
 Provides: weakremover(libXTrap-devel)
 Provides: weakremover(libXTrap6)
 Provides: weakremover(libXxf86misc-devel)
@@ -10345,6 +10346,7 @@ Provides: weakremover(libdvbv5-0-lang)
 Provides: weakremover(libdvdread4)
 Provides: weakremover(libdvdread7)
 Provides: weakremover(libdxflib-3_12_2-1)
+Provides: weakremover(libdxfrw0)
 Provides: weakremover(libeXosip2-11)
 Provides: weakremover(libebl-devel)
 Provides: weakremover(libebl-plugins)
@@ -10939,6 +10941,9 @@ Provides: weakremover(libicu66-ledata)
 Provides: weakremover(libicu67)
 Provides: weakremover(libicu67-bedata)
 Provides: weakremover(libicu67-ledata)
+Provides: weakremover(libicu68)
+Provides: weakremover(libicu68-bedata)
+Provides: weakremover(libicu68-ledata)
 Provides: weakremover(libidn11)
 Provides: weakremover(libidn2-4)
 Provides: weakremover(libidnkit1)
@@ -11323,6 +11328,8 @@ Provides: weakremover(libnanomsg5_1_0)
 Provides: weakremover(libnauty-2_6_11)
 Provides: weakremover(libnauty-2_6_7)
 Provides: weakremover(libnauty-2_7_rc2)
+Provides: weakremover(libnco-4_9_7)
+Provides: weakremover(libnco_c++-4_9_7)
 Provides: weakremover(libndpi2)
 Provides: weakremover(libnetcdf-cxx4_4_3_0-gnu-hpc)
 Provides: weakremover(libnetcdf-cxx4_4_3_0-gnu-hpc-devel)
@@ -26304,8 +26311,12 @@ Provides: weakremover(xaos-lang)
 Provides: weakremover(xdcc)
 Provides: weakremover(xf86rushproto-devel)
 Provides: weakremover(xfce4-icon-theme)
+Provides: weakremover(xfce4-mixer)
+Provides: weakremover(xfce4-mixer-lang)
+Provides: weakremover(xfce4-mixer-plugin)
 Provides: weakremover(xfce4-multiload-nandhp-plugin)
 Provides: weakremover(xfce4-netspeed-plugin)
+Provides: weakremover(xfce4-panel-plugin-mixer)
 Provides: weakremover(xfce4-panel-plugin-multiload-nandhp)
 Provides: weakremover(xfce4-panel-plugin-netspeed)
 Provides: weakremover(xfce4-panel-plugin-sntray)
@@ -28650,6 +28661,7 @@ Provides: weakremover(libicu59_1-32bit)
 Provides: weakremover(libicu60_2-32bit)
 Provides: weakremover(libicu66-32bit)
 Provides: weakremover(libicu67-32bit)
+Provides: weakremover(libicu68-32bit)
 Provides: weakremover(libidn11-32bit)
 Provides: weakremover(libidn2-4-32bit)
 Provides: weakremover(libidnkit1-32bit)