diff --git a/.files b/.files index 370f2a6..195e2ba 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 7b82153..7414900 100644 --- a/.rev +++ b/.rev @@ -3982,4 +3982,11 @@ staging-bot Automatic update + + 2b5c36fc9817c5970ee77a3343ad0174 + unknown + + staging-bot + Automatic update + diff --git a/.servicemark b/.servicemark index a21e511..46344c0 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -c3747f68b80741c39c8240fb511ad56f +e28ae477554fdaa8449b02521a63dced diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index 96e3b58..7905550 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 20200520) +# spec file for package openSUSE-Addon-NonOss-release (Version 20200523) # # Copyright (c) 2020 openSUSE. # @@ -16,16 +16,16 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}} -Version: 20200520 +Version: 20200523 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20200520-0 +Provides: product(openSUSE-Addon-NonOss) = 20200523-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20200520 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20200523 AutoReqProv: on @@ -49,10 +49,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20200520 + 20200523 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20200520 + cpe:/o:opensuse:opensuse-addon-nonoss:20200523 diff --git a/openSUSE-MicroOS-release.spec b/openSUSE-MicroOS-release.spec index 9e9f990..f296387 100644 --- a/openSUSE-MicroOS-release.spec +++ b/openSUSE-MicroOS-release.spec @@ -17,7 +17,7 @@ Name: openSUSE-MicroOS-release -Version: 20200520 +Version: 20200523 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -169,9 +169,9 @@ Provides: weakremover(openssl-debuginfo) %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE-MicroOS -Provides: product(openSUSE-MicroOS) = 20200520-0 +Provides: product(openSUSE-MicroOS) = 20200523-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20200520 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20200523 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(openSUSE-MicroOS) @@ -187,7 +187,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20200520-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200523-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -203,7 +203,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(kubic-dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20200520-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200523-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description kubic-dvd @@ -219,7 +219,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE-MicroOS) = 20200520-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200523-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -235,7 +235,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kubic) -Provides: product_flavor(openSUSE-MicroOS) = 20200520-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200523-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -293,11 +293,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-MicroOS.prod << EOF openSUSE openSUSE-MicroOS - 20200520 + 20200523 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-microos:20200520 + cpe:/o:opensuse:opensuse-microos:20200523 openSUSE-MicroOS diff --git a/openSUSE-release.spec b/openSUSE-release.spec index 90751f4..42e93a9 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20200520 +Version: 20200523 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) = 20200520-0 +Provides: product(openSUSE) = 20200523-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%3A20200520 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20200523 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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-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) = 20200520-0 +Provides: product_flavor(openSUSE) = 20200523-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -550,10 +550,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF openSUSE openSUSE - 20200520 + 20200523 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20200520 + cpe:/o:opensuse:opensuse:20200523 openSUSE diff --git a/weakremovers.inc b/weakremovers.inc index b48f664..d5e5d58 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -9386,6 +9386,7 @@ Provides: weakremover(libQtWebKit4) Provides: weakremover(libRivet-2_5_4) Provides: weakremover(libRivet-2_6_0) Provides: weakremover(libRivet-2_7_2) +Provides: weakremover(libRivet-3_1_0) Provides: weakremover(libSDL_bgi1) Provides: weakremover(libSHERPA-MC-config) Provides: weakremover(libSPIRV-Tools-suse11) @@ -10006,6 +10007,7 @@ Provides: weakremover(libdpdk-17_08-0) Provides: weakremover(libdpdk-17_11-0) Provides: weakremover(libdpdk-18_02) Provides: weakremover(libdpdk-18_02-0) +Provides: weakremover(libdpdk-18_11) Provides: weakremover(libdruntime-ldc68) Provides: weakremover(libdruntime-ldc82) Provides: weakremover(libdruntime-ldc83) @@ -21512,7 +21514,6 @@ Provides: weakremover(installation-images-Kubic) Provides: weakremover(kernel-pae-base) Provides: weakremover(kubicctl) Provides: weakremover(kubicd) -Provides: weakremover(libdpdk-18_11) Provides: weakremover(libpmi0) Provides: weakremover(libshiboken-1_2_cpython-36m-i386-linux-gnu1_2) Provides: weakremover(libsvrcore0)