From 7d2776688d106a712d5e54df3bb60075a8f7256b Mon Sep 17 00:00:00 2001
From: staging-bot <>
Date: Apr 13 2022 19:48:58 +0000
Subject: Update 000release-packages to rev 1554


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

---

diff --git a/.files b/.files
index 1c266d3..90ba3a6 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 61bddc5..c286db7 100644
--- a/.rev
+++ b/.rev
@@ -10871,4 +10871,11 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
+  <revision rev="1554" vrev="1554">
+    <srcmd5>36ec4967d75bc3c7f3669bcf777e0d88</srcmd5>
+    <version>unknown</version>
+    <time>1649879035</time>
+    <user>staging-bot</user>
+    <comment>Automatic update</comment>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index 729ab8c..0a63e42 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-e04e76d4753f6a9560d4023ee2732233
+2c8efdf795e56a65451ec0da20b9bf2e
diff --git a/MicroOS-release.spec b/MicroOS-release.spec
index 8825daa..3bb670d 100644
--- a/MicroOS-release.spec
+++ b/MicroOS-release.spec
@@ -17,7 +17,7 @@
 
 
 Name:           MicroOS-release
-Version:        20220412
+Version:        20220413
 Release:        0
 Summary:        openSUSE MicroOS 
 License:        GPL-2.0-or-later
@@ -176,9 +176,9 @@ ExclusiveArch:  %ix86 x86_64 ppc64le s390x aarch64 %arm
 %include %{SOURCE100}
 Provides:       %name-%version
 Provides:       product() = MicroOS
-Provides:       product(MicroOS) = 20220412-0
+Provides:       product(MicroOS) = 20220413-0
 Provides:       product-label() = openSUSE%20MicroOS
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20220412
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20220413
 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 +194,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
-Provides:       product_flavor(MicroOS) = 20220412-0
+Provides:       product_flavor(MicroOS) = 20220413-0
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -210,7 +210,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(kubic-dvd)
-Provides:       product_flavor(MicroOS) = 20220412-0
+Provides:       product_flavor(MicroOS) = 20220413-0
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description kubic-dvd
@@ -226,7 +226,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance)
-Provides:       product_flavor(MicroOS) = 20220412-0
+Provides:       product_flavor(MicroOS) = 20220413-0
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -242,7 +242,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-kubic)
-Provides:       product_flavor(MicroOS) = 20220412-0
+Provides:       product_flavor(MicroOS) = 20220413-0
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance-kubic
@@ -299,11 +299,11 @@ cat >%{buildroot}%{_sysconfdir}/products.d/MicroOS.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>MicroOS</name>
-  <version>20220412</version>
+  <version>20220413</version>
   <release>0</release>
   <endoflife></endoflife>
   <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:microos:20220412</cpeid>
+  <cpeid>cpe:/o:opensuse:microos:20220413</cpeid>
   <productline>MicroOS</productline>
   <register>
     <pool>
diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec
index 29b0684..cfd4b7c 100644
--- a/openSUSE-Addon-NonOss-release.spec
+++ b/openSUSE-Addon-NonOss-release.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package openSUSE-Addon-NonOss-release (Version 20220412)
+# spec file for package openSUSE-Addon-NonOss-release (Version 20220413)
 #
 # Copyright (c) 2022 openSUSE.
 #
@@ -16,16 +16,16 @@
 Name:           openSUSE-Addon-NonOss-release
 %define         product openSUSE-Addon-NonOss
 Summary:        openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
-Version:        20220412
+Version:        20220413
 Release:        0
 License:        BSD-3-Clause
 Group:          System/Fhs
 
 Provides:       %name-%version
 Provides:       product() = openSUSE-Addon-NonOss
-Provides:       product(openSUSE-Addon-NonOss) = 20220412-0
+Provides:       product(openSUSE-Addon-NonOss) = 20220413-0
 Provides:       product-label() = non%20oss%20addon
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20220412
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20220413
 
 
 AutoReqProv:    on
@@ -48,10 +48,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE-Addon-NonOss.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>openSUSE-Addon-NonOss</name>
-  <version>20220412</version>
+  <version>20220413</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20220412</cpeid>
+  <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20220413</cpeid>
   <register>
     <pool>
     </pool>
diff --git a/openSUSE-release.spec b/openSUSE-release.spec
index b6466b2..29172e8 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -20,7 +20,7 @@
 #define betaversion %{nil}
 %define codename Tumbleweed
 Name:           openSUSE-release
-Version:        20220412
+Version:        20220413
 Release:        0
 # 0 is the product release, not the build release of this package
 Summary:        openSUSE Tumbleweed
@@ -178,7 +178,7 @@ Provides:       weakremover(openssl-debuginfo)
 %include %{SOURCE100}
 Provides:       %name-%version
 Provides:       product() = openSUSE
-Provides:       product(openSUSE) = 20220412-0
+Provides:       product(openSUSE) = 20220413-0
 %ifarch x86_64
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
 %endif
@@ -192,7 +192,7 @@ Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dppc64le
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Daarch64
 %endif
 Provides:       product-label() = openSUSE
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20220412
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20220413
 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 +206,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(ftp)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description ftp
@@ -221,7 +221,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(mini)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description mini
@@ -236,7 +236,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -251,7 +251,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-kde)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-kde
@@ -266,7 +266,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-x11)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-x11
@@ -281,7 +281,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-gnome)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-gnome
@@ -296,7 +296,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-xfce)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-xfce
@@ -311,7 +311,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-kde)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-kde
@@ -326,7 +326,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-gnome)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-gnome
@@ -341,7 +341,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-x11)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-x11
@@ -356,7 +356,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -371,7 +371,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-docker)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-docker
@@ -386,7 +386,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-kvm)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-kvm
@@ -401,7 +401,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-vmware)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vmware
@@ -416,7 +416,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-openstack)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-openstack
@@ -431,7 +431,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-hyperv)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-hyperv
@@ -446,7 +446,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-vagrant)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vagrant
@@ -461,7 +461,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-wsl)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-wsl
@@ -476,7 +476,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-custom)
-Provides:       product_flavor(openSUSE) = 20220412-0
+Provides:       product_flavor(openSUSE) = 20220413-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-custom
@@ -536,6 +536,11 @@ elif [ -f %{_prefix}/lib/skelcd/CD1/control.xml ]; then
   install -m 644 %{_prefix}/lib/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/
 fi
 
+# enable vendor change openSUSE,SUSE for DUP from 15.3 to TW (boo#1198332)
+mkdir -p %{buildroot}%{_sysconfdir}/zypp/vendors.d
+echo -e "[main]\nvendors=openSUSE,SUSE,SUSE LLC <https://www.suse.com/>\n" > %{buildroot}%{_sysconfdir}/zypp/vendors.d/00-openSUSE.conf
+
+
 # fate#319341, make openSUSE-release own YaST license files. TODO:
 # get rid of /etc/YaST2/licenses
 install -D -d -m 755 "%{buildroot}%_defaultlicensedir/product/base"
@@ -552,10 +557,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>openSUSE</name>
-  <version>20220412</version>
+  <version>20220413</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse:20220412</cpeid>
+  <cpeid>cpe:/o:opensuse:opensuse:20220413</cpeid>
   <productline>openSUSE</productline>
   <register>
     <pool>
@@ -751,6 +756,7 @@ fi
 # Bug 404141 - /etc/YaST/control.xml should be owned by some package
 %dir %{_sysconfdir}/YaST2/
 %config %{_sysconfdir}/YaST2/control.xml
+%config %{_sysconfdir}/zypp/vendors.d/00-openSUSE.conf
 %{_prefix}/lib/motd.d/welcome
 %dir %{_prefix}/lib/issue.d/
 %{_prefix}/lib/issue.d/10-openSUSE.conf