From d6da14de0a0063f7ee8a80a9db337400c3c72652 Mon Sep 17 00:00:00 2001
From: staging-bot <>
Date: Jun 23 2021 23:27:49 +0000
Subject: Update 000release-packages to rev 1025
https://build.opensuse.org/package/rdiff/openSUSE:Factory/000release-packages?linkrev=base&rev=1025
by user staging-bot
Automatic update
---
diff --git a/.rev b/.rev
index 59fd224..86623ad 100644
--- a/.rev
+++ b/.rev
@@ -6846,7 +6846,6 @@
staging-bot
Automatic update
-<<<<<<< Updated upstream
9207c81a2daca42dd4284fc5e24b0de5
unknown
@@ -7204,6 +7203,4 @@
staging-bot
Automatic update
-=======
->>>>>>> Stashed changes
diff --git a/.servicemark b/.servicemark
index 56b657f..d649f9e 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1,5 +1 @@
-<<<<<<< Updated upstream
b8b867296e2fbd3d5649e0a773a89d77
-=======
-ef63c03f7bf1f6f446e8ce506f3994f8
->>>>>>> Stashed changes
diff --git a/MicroOS-release.spec b/MicroOS-release.spec
index 7646209..3c9eae5 100644
--- a/MicroOS-release.spec
+++ b/MicroOS-release.spec
@@ -17,11 +17,7 @@
Name: MicroOS-release
-<<<<<<< Updated upstream
Version: 20210623
-=======
-Version: 20210510
->>>>>>> Stashed changes
Release: 0
Summary: openSUSE MicroOS
License: GPL-2.0-or-later
@@ -180,15 +176,9 @@ ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 %arm
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = MicroOS
-<<<<<<< Updated upstream
Provides: product(MicroOS) = 20210623-0
Provides: product-label() = openSUSE%20MicroOS
Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210623
-=======
-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)
@@ -204,11 +194,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-<<<<<<< Updated upstream
Provides: product_flavor(MicroOS) = 20210623-0
-=======
-Provides: product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description dvd
@@ -224,11 +210,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(kubic-dvd)
-<<<<<<< Updated upstream
Provides: product_flavor(MicroOS) = 20210623-0
-=======
-Provides: product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description kubic-dvd
@@ -244,11 +226,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-<<<<<<< Updated upstream
Provides: product_flavor(MicroOS) = 20210623-0
-=======
-Provides: product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description appliance
@@ -264,11 +242,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-kubic)
-<<<<<<< Updated upstream
Provides: product_flavor(MicroOS) = 20210623-0
-=======
-Provides: product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description appliance-kubic
@@ -327,19 +301,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
openSUSE
MicroOS
-<<<<<<< Updated upstream
20210623
0
%{_target_cpu}
cpe:/o:opensuse:microos:20210623
-=======
- 20210510
- 0
-
- %{_target_cpu}
- cpe:/o:opensuse:microos:20210510
->>>>>>> Stashed changes
MicroOS
diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec
index 9150b52..040ab7b 100644
--- a/openSUSE-Addon-NonOss-release.spec
+++ b/openSUSE-Addon-NonOss-release.spec
@@ -1,9 +1,5 @@
#
-<<<<<<< Updated upstream
# spec file for package openSUSE-Addon-NonOss-release (Version 20210623)
-=======
-# spec file for package openSUSE-Addon-NonOss-release (Version 20210510)
->>>>>>> Stashed changes
#
# Copyright (c) 2021 openSUSE.
#
@@ -20,26 +16,16 @@
Name: openSUSE-Addon-NonOss-release
%define product openSUSE-Addon-NonOss
Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
-<<<<<<< Updated upstream
Version: 20210623
-=======
-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) = 20210623-0
Provides: product-label() = non%20oss%20addon
Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210623
-=======
-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
@@ -63,17 +49,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
openSUSE
openSUSE-Addon-NonOss
-<<<<<<< Updated upstream
20210623
0
%{_target_cpu}
cpe:/o:opensuse:opensuse-addon-nonoss:20210623
-=======
- 20210510
- 0
- %{_target_cpu}
- cpe:/o:opensuse:opensuse-addon-nonoss:20210510
->>>>>>> Stashed changes
diff --git a/openSUSE-release.spec b/openSUSE-release.spec
index 85e60cd..45d8d5d 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -20,11 +20,7 @@
#define betaversion %{nil}
%define codename Tumbleweed
Name: openSUSE-release
-<<<<<<< Updated upstream
Version: 20210623
-=======
-Version: 20210510
->>>>>>> Stashed changes
Release: 0
# 0 is the product release, not the build release of this package
Summary: openSUSE Tumbleweed
@@ -182,11 +178,7 @@ Provides: weakremover(openssl-debuginfo)
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = openSUSE
-<<<<<<< Updated upstream
Provides: product(openSUSE) = 20210623-0
-=======
-Provides: product(openSUSE) = 20210510-0
->>>>>>> Stashed changes
%ifarch x86_64
Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
%endif
@@ -200,11 +192,7 @@ 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%3A20210623
-=======
-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)
@@ -218,11 +206,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(ftp)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description ftp
@@ -237,11 +221,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(mini)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description mini
@@ -256,11 +236,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description dvd
@@ -275,11 +251,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-kde)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-kde
@@ -294,11 +266,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-x11)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-x11
@@ -313,11 +281,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-gnome)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-gnome
@@ -332,11 +296,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-xfce)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-xfce
@@ -351,11 +311,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-kde)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-kde
@@ -370,11 +326,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-gnome)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-gnome
@@ -389,11 +341,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-x11)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-x11
@@ -408,11 +356,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance
@@ -427,11 +371,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-docker)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-docker
@@ -446,11 +386,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-kvm)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-kvm
@@ -465,11 +401,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-vmware)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-vmware
@@ -484,11 +416,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-openstack)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-openstack
@@ -503,11 +431,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-hyperv)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-hyperv
@@ -522,11 +446,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-vagrant)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-vagrant
@@ -541,11 +461,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-wsl)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-wsl
@@ -560,11 +476,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-custom)
-<<<<<<< Updated upstream
Provides: product_flavor(openSUSE) = 20210623-0
-=======
-Provides: product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-custom
@@ -639,17 +551,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
openSUSE
openSUSE
-<<<<<<< Updated upstream
20210623
0
%{_target_cpu}
cpe:/o:opensuse:opensuse:20210623
-=======
- 20210510
- 0
- %{_target_cpu}
- cpe:/o:opensuse:opensuse:20210510
->>>>>>> Stashed changes
openSUSE
diff --git a/weakremovers.inc b/weakremovers.inc
index 252341e..b481619 100644
--- a/weakremovers.inc
+++ b/weakremovers.inc
@@ -19772,7 +19772,6 @@ 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(comix)
@@ -19817,11 +19816,7 @@ Provides: weakremover(cross-rx-gcc9-bootstrap)
Provides: weakremover(cryptconfig)
Provides: weakremover(cryptol)
Provides: weakremover(csound-java-bindings)
-<<<<<<< Updated upstream
Provides: weakremover(cura-engine)
-=======
-Provides: weakremover(cura1-lulzbot)
->>>>>>> Stashed changes
Provides: weakremover(curl-mini)
Provides: weakremover(cvs2svn)
Provides: weakremover(cyradm)
@@ -24679,13 +24674,6 @@ 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)
-<<<<<<< Updated upstream
-=======
-Provides: weakremover(libXTrap-devel)
-Provides: weakremover(libXTrap6)
-Provides: weakremover(libXxf86misc-devel)
-Provides: weakremover(libXxf86misc1)
->>>>>>> Stashed changes
Provides: weakremover(libYODA-1_6_5)
Provides: weakremover(libYODA-1_6_7)
Provides: weakremover(libYODA-1_7_0)
@@ -25235,11 +25223,6 @@ Provides: weakremover(libcilkrts5-gcc6)
Provides: weakremover(libcint3)
Provides: weakremover(libcivetweb1_11_0)
Provides: weakremover(libcivetweb1_13_0)
-<<<<<<< Updated upstream
-=======
-Provides: weakremover(libclamav7)
-Provides: weakremover(libclammspack0)
->>>>>>> Stashed changes
Provides: weakremover(libclang3_8)
Provides: weakremover(libclang4)
Provides: weakremover(libclang6)
@@ -25350,7 +25333,6 @@ Provides: weakremover(libdui1)
Provides: weakremover(libdvbv5-0-lang)
Provides: weakremover(libdvdread7)
Provides: weakremover(libdxflib-3_12_2-1)
-Provides: weakremover(libdxfrw0)
Provides: weakremover(libeXosip2-11)
Provides: weakremover(libebl1)
Provides: weakremover(libebml4)
@@ -25729,10 +25711,6 @@ Provides: weakremover(libicu67-ledata)
Provides: weakremover(libicu68)
Provides: weakremover(libicu68-bedata)
Provides: weakremover(libicu68-ledata)
-<<<<<<< Updated upstream
-=======
-Provides: weakremover(libidn11)
->>>>>>> Stashed changes
Provides: weakremover(libidn2-4)
Provides: weakremover(libidnkit1)
Provides: weakremover(libidnkitlite1)
@@ -26053,8 +26031,6 @@ 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-fortran_4_4_4-gnu-openmpi3-hpc)
Provides: weakremover(libnetcdf-fortran_4_4_5-gnu-mpich-hpc)
@@ -27283,16 +27259,8 @@ Provides: weakremover(lprof)
Provides: weakremover(lrcShow-X)
Provides: weakremover(lrcShow-X-lang)
Provides: weakremover(lrzip)
-<<<<<<< Updated upstream
-Provides: weakremover(lttng-modules)
-Provides: weakremover(lttng-modules-kmp-default)
-=======
-Provides: weakremover(lswm)
Provides: weakremover(lttng-modules)
Provides: weakremover(lttng-modules-kmp-default)
-Provides: weakremover(ltxml)
-Provides: weakremover(ltxml-devel)
->>>>>>> Stashed changes
Provides: weakremover(lua-devel)
Provides: weakremover(lua-doc)
Provides: weakremover(lua-lgi-doc)
@@ -43985,19 +43953,6 @@ Provides: weakremover(libyami-utils)
Provides: weakremover(liquidhaskell)
Provides: weakremover(lmms-devel)
Provides: weakremover(lttng-modules-kmp-pae)
-<<<<<<< Updated upstream
-=======
-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)
-Provides: weakremover(pandoc)
-Provides: weakremover(patterns-base-32bit)
->>>>>>> Stashed changes
Provides: weakremover(patterns-server-xen_server)
Provides: weakremover(python3-itk)
Provides: weakremover(python38-fabio)
@@ -44029,15 +43984,6 @@ Provides: weakremover(python2-pymol)
Provides: weakremover(libomp5-devel)
%endif
%ifarch x86_64
-<<<<<<< Updated upstream
-=======
-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)
->>>>>>> Stashed changes
Provides: weakremover(allegro-dga2-plugin-32bit)
Provides: weakremover(allegro-jack-plugin-32bit)
Provides: weakremover(alsa-plugins-32bit)