diff --git a/.files b/.files index 5680f20..8f17f19 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 69b127c..5f7fa55 100644 --- a/.rev +++ b/.rev @@ -7672,4 +7672,11 @@ staging-bot Automatic update + + 37e772c559394f3897858238e0ef269b + unknown + + staging-bot + Automatic update + diff --git a/.servicemark b/.servicemark index 40129bb..8dd7f43 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -373d869f7ba0d8003542f59fb8ccfaaa +f64ea9de33c6bcb5b8b67dc0d787b103 diff --git a/MicroOS-release.spec b/MicroOS-release.spec index f7f7a94..d331371 100644 --- a/MicroOS-release.spec +++ b/MicroOS-release.spec @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20210803 +Version: 20210804 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) = 20210803-0 +Provides: product(MicroOS) = 20210804-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210803 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210804 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) = 20210803-0 +Provides: product_flavor(MicroOS) = 20210804-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) = 20210803-0 +Provides: product_flavor(MicroOS) = 20210804-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) = 20210803-0 +Provides: product_flavor(MicroOS) = 20210804-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) = 20210803-0 +Provides: product_flavor(MicroOS) = 20210804-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -299,11 +299,11 @@ cat >%{buildroot}%{_sysconfdir}/products.d/MicroOS.prod << EOF openSUSE MicroOS - 20210803 + 20210804 0 %{_target_cpu} - cpe:/o:opensuse:microos:20210803 + cpe:/o:opensuse:microos:20210804 MicroOS diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index 297cd1e..8007ffe 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 20210803) +# spec file for package openSUSE-Addon-NonOss-release (Version 20210804) # # Copyright (c) 2021 openSUSE. # @@ -16,16 +16,16 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}} -Version: 20210803 +Version: 20210804 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20210803-0 +Provides: product(openSUSE-Addon-NonOss) = 20210804-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210803 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210804 AutoReqProv: on @@ -48,10 +48,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20210803 + 20210804 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20210803 + cpe:/o:opensuse:opensuse-addon-nonoss:20210804 diff --git a/openSUSE-release.spec b/openSUSE-release.spec index aac8d04..9be9660 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20210803 +Version: 20210804 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) = 20210803-0 +Provides: product(openSUSE) = 20210804-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%3A20210803 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210804 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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-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) = 20210803-0 +Provides: product_flavor(openSUSE) = 20210804-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -552,10 +552,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE.prod << EOF openSUSE openSUSE - 20210803 + 20210804 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20210803 + cpe:/o:opensuse:opensuse:20210804 openSUSE diff --git a/weakremovers.inc b/weakremovers.inc index 6e98b9d..8772746 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -8351,8 +8351,6 @@ Provides: weakremover(libmng-devel) Provides: weakremover(libmng2) Provides: weakremover(libmnl-devel) Provides: weakremover(libmnl0) -Provides: weakremover(libmodman-devel) -Provides: weakremover(libmodman1) Provides: weakremover(libmodplug-devel) Provides: weakremover(libmodplug1) Provides: weakremover(libmodsecurity3) @@ -19269,7 +19267,6 @@ Provides: weakremover(adwaita-qt4) Provides: weakremover(albumshaper) Provides: weakremover(amazon-ecs-init) Provides: weakremover(analyzeMFT) -Provides: weakremover(android-tools) Provides: weakremover(angelscript) Provides: weakremover(anjuta-extras-lang) Provides: weakremover(ant-phone) @@ -26316,6 +26313,7 @@ Provides: weakremover(libpython3_7m1_0) Provides: weakremover(libqalculate11) Provides: weakremover(libqalculate13) Provides: weakremover(libqalculate20) +Provides: weakremover(libqalculate21) Provides: weakremover(libqalculate9) Provides: weakremover(libqca2) Provides: weakremover(libqca2-devel) @@ -41133,6 +41131,8 @@ Provides: weakremover(libmidori-core0) Provides: weakremover(libminiupnpc16) Provides: weakremover(libmjpegutils-2_0-0) Provides: weakremover(libmodglue1) +Provides: weakremover(libmodman-devel) +Provides: weakremover(libmodman1) Provides: weakremover(libmolsketch-qt5-1) Provides: weakremover(libmozjs-17_0) Provides: weakremover(libmozjs-38) @@ -45224,6 +45224,7 @@ Provides: weakremover(libmediastreamer_voip7-32bit) Provides: weakremover(libmidori-core1-32bit) Provides: weakremover(libminiupnpc16-32bit) Provides: weakremover(libmjpegutils-2_0-0-32bit) +Provides: weakremover(libmodman1-32bit) Provides: weakremover(libmozjs-17_0-32bit) Provides: weakremover(libmozjs-38-32bit) Provides: weakremover(libmpeg2encpp-2_0-0-32bit)