From 353ccf6db86b4c5bed5fa466561c9be2f087eb98 Mon Sep 17 00:00:00 2001
From: staging-bot <>
Date: May 10 2021 13:25:18 +0000
Subject: Update 000release-packages to rev 976


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

---

diff --git a/.rev b/.rev
index eee5f54..bf7c0d9 100644
--- a/.rev
+++ b/.rev
@@ -6813,7 +6813,10 @@
   </revision>
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+=======
 =======
+>>>>>>> Stashed changes
 =======
 >>>>>>> Stashed changes
   <revision rev="974" vrev="974">
@@ -6824,8 +6827,11 @@
     <comment>Automatic update</comment>
   </revision>
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
 =======
+=======
+>>>>>>> Stashed changes
   <revision rev="975" vrev="975">
     <srcmd5>7855cb2000221cbee5308ae47bdecac3</srcmd5>
     <version>unknown</version>
@@ -6833,5 +6839,15 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+  <revision rev="976" vrev="976">
+    <srcmd5>2c8691a952e8275668bdb466a4fe5b15</srcmd5>
+    <version>unknown</version>
+    <time>1620652882</time>
+    <user>staging-bot</user>
+    <comment>Automatic update</comment>
+  </revision>
 >>>>>>> Stashed changes
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index d065d94..77800b0 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1,5 +1,6 @@
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 8974c5e31f55a0c863cce2a213e80ea1
 =======
 cc4598d1611e7429d4cbcd1a6e0e73e7
@@ -7,3 +8,6 @@ cc4598d1611e7429d4cbcd1a6e0e73e7
 =======
 eb97875a5ed70118fda5b31fc2b1e450
 >>>>>>> Stashed changes
+=======
+1f99ca6895bc64e1156a0829c74ed9c1
+>>>>>>> Stashed changes
diff --git a/MicroOS-release.spec b/MicroOS-release.spec
index bd45739..5e67d99 100644
--- a/MicroOS-release.spec
+++ b/MicroOS-release.spec
@@ -19,6 +19,7 @@
 Name:           MicroOS-release
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Version:        20210507
 =======
 Version:        20210508
@@ -26,6 +27,9 @@ Version:        20210508
 =======
 Version:        20210508
 >>>>>>> Stashed changes
+=======
+Version:        20210508
+>>>>>>> Stashed changes
 Release:        0
 Summary:        openSUSE MicroOS 
 License:        GPL-2.0-or-later
@@ -186,6 +190,7 @@ Provides:       %name-%version
 Provides:       product() = MicroOS
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product(MicroOS) = 20210507-0
 Provides:       product-label() = openSUSE%20MicroOS
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210507
@@ -199,6 +204,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)
@@ -216,6 +226,7 @@ Provides:       product_flavor()
 Provides:       flavor(dvd)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
@@ -223,6 +234,9 @@ Provides:       product_flavor(MicroOS) = 20210508-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -240,6 +254,7 @@ Provides:       product_flavor()
 Provides:       flavor(kubic-dvd)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
@@ -247,6 +262,9 @@ Provides:       product_flavor(MicroOS) = 20210508-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
@@ -264,6 +282,7 @@ Provides:       product_flavor()
 Provides:       flavor(appliance)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
@@ -271,6 +290,9 @@ Provides:       product_flavor(MicroOS) = 20210508-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -288,6 +310,7 @@ Provides:       product_flavor()
 Provides:       flavor(appliance-kubic)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
@@ -295,6 +318,9 @@ Provides:       product_flavor(MicroOS) = 20210508-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
@@ -355,6 +381,7 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
   <name>MicroOS</name>
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
   <version>20210507</version>
   <release>0</release>
   <endoflife></endoflife>
@@ -363,12 +390,17 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
 =======
 =======
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
   <version>20210508</version>
   <release>0</release>
   <endoflife></endoflife>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:microos:20210508</cpeid>
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 =======
 >>>>>>> Stashed changes
diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec
index 7ff4e62..1a38f8c 100644
--- a/openSUSE-Addon-NonOss-release.spec
+++ b/openSUSE-Addon-NonOss-release.spec
@@ -1,6 +1,7 @@
 #
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 # spec file for package openSUSE-Addon-NonOss-release (Version 20210507)
 =======
 # spec file for package openSUSE-Addon-NonOss-release (Version 20210508)
@@ -8,6 +9,9 @@
 =======
 # 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.
 #
@@ -26,6 +30,7 @@ Name:           openSUSE-Addon-NonOss-release
 Summary:        openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Version:        20210507
 =======
 Version:        20210508
@@ -33,6 +38,9 @@ Version:        20210508
 =======
 Version:        20210508
 >>>>>>> Stashed changes
+=======
+Version:        20210508
+>>>>>>> Stashed changes
 Release:        0
 License:        BSD-3-Clause
 Group:          System/Fhs
@@ -41,6 +49,7 @@ Provides:       %name-%version
 Provides:       product() = openSUSE-Addon-NonOss
 <<<<<<< Updated upstream
 <<<<<<< 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
@@ -54,6 +63,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
@@ -79,6 +93,7 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
   <name>openSUSE-Addon-NonOss</name>
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
   <version>20210507</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
@@ -86,11 +101,16 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
 =======
 =======
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
   <version>20210508</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210508</cpeid>
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 =======
 >>>>>>> Stashed changes
diff --git a/openSUSE-release.spec b/openSUSE-release.spec
index ec6ee0d..d9826fb 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -22,6 +22,7 @@
 Name:           openSUSE-release
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Version:        20210507
 =======
 Version:        20210508
@@ -29,6 +30,9 @@ Version:        20210508
 =======
 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
@@ -188,6 +192,7 @@ Provides:       %name-%version
 Provides:       product() = openSUSE
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product(openSUSE) = 20210507-0
 =======
 Provides:       product(openSUSE) = 20210508-0
@@ -195,6 +200,9 @@ Provides:       product(openSUSE) = 20210508-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
@@ -210,6 +218,7 @@ Provides:       product-register-target() = openSUSE%2DTumbleweed%2Daarch64
 Provides:       product-label() = openSUSE
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210507
 =======
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210508
@@ -217,6 +226,9 @@ Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210508
 =======
 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)
@@ -232,6 +244,7 @@ Provides:       product_flavor()
 Provides:       flavor(ftp)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -239,6 +252,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description ftp
@@ -255,6 +271,7 @@ Provides:       product_flavor()
 Provides:       flavor(mini)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -262,6 +279,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description mini
@@ -278,6 +298,7 @@ Provides:       product_flavor()
 Provides:       flavor(dvd)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -285,6 +306,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -301,6 +325,7 @@ Provides:       product_flavor()
 Provides:       flavor(livecd-kde)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -308,6 +333,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -324,6 +352,7 @@ Provides:       product_flavor()
 Provides:       flavor(livecd-x11)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -331,6 +360,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -347,6 +379,7 @@ Provides:       product_flavor()
 Provides:       flavor(livecd-gnome)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -354,6 +387,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -370,6 +406,7 @@ Provides:       product_flavor()
 Provides:       flavor(livecd-xfce)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -377,6 +414,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -393,6 +433,7 @@ Provides:       product_flavor()
 Provides:       flavor(usb-kde)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -400,6 +441,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -416,6 +460,7 @@ Provides:       product_flavor()
 Provides:       flavor(usb-gnome)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -423,6 +468,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -439,6 +487,7 @@ Provides:       product_flavor()
 Provides:       flavor(usb-x11)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -446,6 +495,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -462,6 +514,7 @@ Provides:       product_flavor()
 Provides:       flavor(appliance)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -469,6 +522,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210508-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -485,6 +541,7 @@ Provides:       product_flavor()
 Provides:       flavor(appliance-docker)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -492,6 +549,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -508,6 +568,7 @@ Provides:       product_flavor()
 Provides:       flavor(appliance-kvm)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -515,6 +576,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -531,6 +595,7 @@ Provides:       product_flavor()
 Provides:       flavor(appliance-vmware)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -538,6 +603,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -554,6 +622,7 @@ Provides:       product_flavor()
 Provides:       flavor(appliance-openstack)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -561,6 +630,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -577,6 +649,7 @@ Provides:       product_flavor()
 Provides:       flavor(appliance-hyperv)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -584,6 +657,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -600,6 +676,7 @@ Provides:       product_flavor()
 Provides:       flavor(appliance-vagrant)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -607,6 +684,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -623,6 +703,7 @@ Provides:       product_flavor()
 Provides:       flavor(appliance-wsl)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -630,6 +711,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -646,6 +730,7 @@ Provides:       product_flavor()
 Provides:       flavor(appliance-custom)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -653,6 +738,9 @@ Provides:       product_flavor(openSUSE) = 20210508-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
@@ -729,6 +817,7 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
   <name>openSUSE</name>
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
   <version>20210507</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
@@ -745,6 +834,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 b4b2203..7c747f7 100644
--- a/weakremovers.inc
+++ b/weakremovers.inc
@@ -17929,6 +17929,7 @@ Provides: weakremover(python3-discover)
 Provides: weakremover(python3-django-allauth-lang)
 Provides: weakremover(python3-django-babel)
 Provides: weakremover(python3-django-celery)
+Provides: weakremover(python3-django-mailman3)
 Provides: weakremover(python3-doc)
 Provides: weakremover(python3-doc-devhelp)
 Provides: weakremover(python3-docker-py-test)
@@ -18379,6 +18380,7 @@ Provides: weakremover(python38-ara)
 Provides: weakremover(python38-bcolz)
 Provides: weakremover(python38-bump2version)
 Provides: weakremover(python38-cluster-preflight-check)
+Provides: weakremover(python38-django-mailman3)
 Provides: weakremover(python38-dogpile.cache)
 Provides: weakremover(python38-dtaidistance-devel)
 Provides: weakremover(python38-featureflow)