From 5f8d71ba63ec05cca5d3a044b193e0858ff5774e Mon Sep 17 00:00:00 2001
From: staging-bot <>
Date: May 11 2021 14:27:08 +0000
Subject: Update 000release-packages to rev 978


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

---

diff --git a/.rev b/.rev
index 214890f..f2171bc 100644
--- a/.rev
+++ b/.rev
@@ -6815,7 +6815,10 @@
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+=======
 =======
+>>>>>>> Stashed changes
 =======
 >>>>>>> Stashed changes
 =======
@@ -6832,12 +6835,15 @@
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
 =======
 =======
 >>>>>>> Stashed changes
 =======
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
   <revision rev="975" vrev="975">
     <srcmd5>7855cb2000221cbee5308ae47bdecac3</srcmd5>
     <version>unknown</version>
@@ -6847,10 +6853,13 @@
   </revision>
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
 =======
 =======
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
   <revision rev="976" vrev="976">
     <srcmd5>2c8691a952e8275668bdb466a4fe5b15</srcmd5>
     <version>unknown</version>
@@ -6859,8 +6868,11 @@
     <comment>Automatic update</comment>
   </revision>
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
 =======
+=======
+>>>>>>> Stashed changes
   <revision rev="977" vrev="977">
     <srcmd5>f70553a8388e7166f04329e0891fbbd2</srcmd5>
     <version>unknown</version>
@@ -6868,5 +6880,15 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+  <revision rev="978" vrev="978">
+    <srcmd5>f871c83fbed07ac354efc05f27d63e85</srcmd5>
+    <version>unknown</version>
+    <time>1620742987</time>
+    <user>staging-bot</user>
+    <comment>Automatic update</comment>
+  </revision>
 >>>>>>> Stashed changes
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index c5a2377..dc60e89 100644
--- a/.servicemark
+++ b/.servicemark
@@ -2,6 +2,7 @@
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 8974c5e31f55a0c863cce2a213e80ea1
 =======
 cc4598d1611e7429d4cbcd1a6e0e73e7
@@ -15,3 +16,6 @@ eb97875a5ed70118fda5b31fc2b1e450
 =======
 8752bb8a5d119847b4e2fa22db417a25
 >>>>>>> Stashed changes
+=======
+ef63c03f7bf1f6f446e8ce506f3994f8
+>>>>>>> Stashed changes
diff --git a/MicroOS-release.spec b/MicroOS-release.spec
index 85b087a..1eb0a1f 100644
--- a/MicroOS-release.spec
+++ b/MicroOS-release.spec
@@ -21,6 +21,7 @@ Name:           MicroOS-release
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Version:        20210507
 =======
 Version:        20210508
@@ -34,6 +35,9 @@ Version:        20210508
 =======
 Version:        20210510
 >>>>>>> Stashed changes
+=======
+Version:        20210510
+>>>>>>> Stashed changes
 Release:        0
 Summary:        openSUSE MicroOS 
 License:        GPL-2.0-or-later
@@ -196,6 +200,7 @@ Provides:       product() = MicroOS
 <<<<<<< Updated upstream
 <<<<<<< 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
@@ -219,6 +224,11 @@ Provides:       product(MicroOS) = 20210510-0
 Provides:       product-label() = openSUSE%20MicroOS
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210510
 >>>>>>> Stashed changes
+=======
+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)
@@ -238,6 +248,7 @@ Provides:       flavor(dvd)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
@@ -251,6 +262,9 @@ Provides:       product_flavor(MicroOS) = 20210508-0
 =======
 Provides:       product_flavor(MicroOS) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -270,6 +284,7 @@ Provides:       flavor(kubic-dvd)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
@@ -283,6 +298,9 @@ Provides:       product_flavor(MicroOS) = 20210508-0
 =======
 Provides:       product_flavor(MicroOS) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description kubic-dvd
@@ -302,6 +320,7 @@ Provides:       flavor(appliance)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
@@ -315,6 +334,9 @@ Provides:       product_flavor(MicroOS) = 20210508-0
 =======
 Provides:       product_flavor(MicroOS) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -334,6 +356,7 @@ Provides:       flavor(appliance-kubic)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
@@ -347,6 +370,9 @@ Provides:       product_flavor(MicroOS) = 20210508-0
 =======
 Provides:       product_flavor(MicroOS) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance-kubic
@@ -409,6 +435,7 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
   <version>20210507</version>
   <release>0</release>
   <endoflife></endoflife>
@@ -432,11 +459,16 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
 =======
 >>>>>>> Stashed changes
 =======
+=======
+>>>>>>> Stashed changes
   <version>20210510</version>
   <release>0</release>
   <endoflife></endoflife>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:microos:20210510</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 a34453e..c456eda 100644
--- a/openSUSE-Addon-NonOss-release.spec
+++ b/openSUSE-Addon-NonOss-release.spec
@@ -3,6 +3,7 @@
 <<<<<<< Updated upstream
 <<<<<<< 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)
@@ -16,6 +17,9 @@
 =======
 # spec file for package openSUSE-Addon-NonOss-release (Version 20210510)
 >>>>>>> Stashed changes
+=======
+# spec file for package openSUSE-Addon-NonOss-release (Version 20210510)
+>>>>>>> Stashed changes
 #
 # Copyright (c) 2021 openSUSE.
 #
@@ -36,6 +40,7 @@ Summary:        openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Version:        20210507
 =======
 Version:        20210508
@@ -49,6 +54,9 @@ Version:        20210508
 =======
 Version:        20210510
 >>>>>>> Stashed changes
+=======
+Version:        20210510
+>>>>>>> Stashed changes
 Release:        0
 License:        BSD-3-Clause
 Group:          System/Fhs
@@ -59,6 +67,7 @@ Provides:       product() = openSUSE-Addon-NonOss
 <<<<<<< Updated upstream
 <<<<<<< 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
@@ -82,6 +91,11 @@ 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
+=======
+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
@@ -109,6 +123,7 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
   <version>20210507</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
@@ -130,10 +145,15 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
 =======
 >>>>>>> Stashed changes
 =======
+=======
+>>>>>>> Stashed changes
   <version>20210510</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210510</cpeid>
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
   <register>
     <pool>
diff --git a/openSUSE-release.spec b/openSUSE-release.spec
index 3cd165f..dfa2dd6 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -24,6 +24,7 @@ Name:           openSUSE-release
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Version:        20210507
 =======
 Version:        20210508
@@ -37,6 +38,9 @@ Version:        20210508
 =======
 Version:        20210510
 >>>>>>> Stashed changes
+=======
+Version:        20210510
+>>>>>>> Stashed changes
 Release:        0
 # 0 is the product release, not the build release of this package
 Summary:        openSUSE Tumbleweed
@@ -198,6 +202,7 @@ Provides:       product() = openSUSE
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product(openSUSE) = 20210507-0
 =======
 Provides:       product(openSUSE) = 20210508-0
@@ -211,6 +216,9 @@ Provides:       product(openSUSE) = 20210508-0
 =======
 Provides:       product(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 %ifarch x86_64
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
 %endif
@@ -228,6 +236,7 @@ Provides:       product-label() = openSUSE
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210507
 =======
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210508
@@ -241,6 +250,9 @@ Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210508
 =======
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210510
 >>>>>>> Stashed changes
+=======
+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)
@@ -258,6 +270,7 @@ Provides:       flavor(ftp)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -271,6 +284,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description ftp
@@ -289,6 +305,7 @@ Provides:       flavor(mini)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -302,6 +319,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description mini
@@ -320,6 +340,7 @@ Provides:       flavor(dvd)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -333,6 +354,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -351,6 +375,7 @@ Provides:       flavor(livecd-kde)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -364,6 +389,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-kde
@@ -382,6 +410,7 @@ Provides:       flavor(livecd-x11)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -395,6 +424,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-x11
@@ -413,6 +445,7 @@ Provides:       flavor(livecd-gnome)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -426,6 +459,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-gnome
@@ -444,6 +480,7 @@ Provides:       flavor(livecd-xfce)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -457,6 +494,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-xfce
@@ -475,6 +515,7 @@ Provides:       flavor(usb-kde)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -488,6 +529,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-kde
@@ -506,6 +550,7 @@ Provides:       flavor(usb-gnome)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -519,6 +564,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-gnome
@@ -537,6 +585,7 @@ Provides:       flavor(usb-x11)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -550,6 +599,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-x11
@@ -568,6 +620,7 @@ Provides:       flavor(appliance)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -581,6 +634,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -599,6 +655,7 @@ Provides:       flavor(appliance-docker)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -612,6 +669,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-docker
@@ -630,6 +690,7 @@ Provides:       flavor(appliance-kvm)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -643,6 +704,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-kvm
@@ -661,6 +725,7 @@ Provides:       flavor(appliance-vmware)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -674,6 +739,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vmware
@@ -692,6 +760,7 @@ Provides:       flavor(appliance-openstack)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -705,6 +774,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-openstack
@@ -723,6 +795,7 @@ Provides:       flavor(appliance-hyperv)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -736,6 +809,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-hyperv
@@ -754,6 +830,7 @@ Provides:       flavor(appliance-vagrant)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -767,6 +844,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vagrant
@@ -785,6 +865,7 @@ Provides:       flavor(appliance-wsl)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -798,6 +879,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-wsl
@@ -816,6 +900,7 @@ Provides:       flavor(appliance-custom)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -829,6 +914,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210510-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-custom
@@ -907,6 +995,7 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
   <version>20210507</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
@@ -935,6 +1024,12 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:opensuse:20210510</cpeid>
 >>>>>>> Stashed changes
+=======
+  <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 91b44a0..407569b 100644
--- a/weakremovers.inc
+++ b/weakremovers.inc
@@ -27696,6 +27696,8 @@ Provides: weakremover(lttng-modules-kmp-pae)
 Provides: weakremover(mozldap-devel)
 Provides: weakremover(mozldap-libs)
 Provides: weakremover(mozldap-tools)
+Provides: weakremover(netgen)
+Provides: weakremover(netgen-devel)
 Provides: weakremover(openarena)
 Provides: weakremover(ovmf)
 Provides: weakremover(ovmf-tools)