diff --git a/.files b/.files index 3c819b2..bd62e7c 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 1156982..33434d6 100644 --- a/.rev +++ b/.rev @@ -6972,4 +6972,11 @@ staging-bot Automatic update + + 786287d8f91972498506466cb04fdd59 + unknown + + staging-bot + Automatic update + diff --git a/.servicemark b/.servicemark index 2c3e77e..b3ff384 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -0d70bec144016e6b31cfca8835864854 +3b2a962c0f5214f3ee18fb96f031b712 diff --git a/MicroOS-release.spec b/MicroOS-release.spec index 76c1e79..8bdffb7 100644 --- a/MicroOS-release.spec +++ b/MicroOS-release.spec @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20210524 +Version: 20210525 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) = 20210524-0 +Provides: product(MicroOS) = 20210525-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210524 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210525 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) = 20210524-0 +Provides: product_flavor(MicroOS) = 20210525-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) = 20210524-0 +Provides: product_flavor(MicroOS) = 20210525-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) = 20210524-0 +Provides: product_flavor(MicroOS) = 20210525-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) = 20210524-0 +Provides: product_flavor(MicroOS) = 20210525-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -301,11 +301,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF openSUSE MicroOS - 20210524 + 20210525 0 %{_target_cpu} - cpe:/o:opensuse:microos:20210524 + cpe:/o:opensuse:microos:20210525 MicroOS diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index 60aaea3..13d2db6 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 20210524) +# spec file for package openSUSE-Addon-NonOss-release (Version 20210525) # # 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: 20210524 +Version: 20210525 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20210524-0 +Provides: product(openSUSE-Addon-NonOss) = 20210525-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210524 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210525 AutoReqProv: on @@ -49,10 +49,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20210524 + 20210525 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20210524 + cpe:/o:opensuse:opensuse-addon-nonoss:20210525 diff --git a/openSUSE-release.spec b/openSUSE-release.spec index 0ea355e..8a92804 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20210524 +Version: 20210525 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) = 20210524-0 +Provides: product(openSUSE) = 20210525-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%3A20210524 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210525 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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-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) = 20210524-0 +Provides: product_flavor(openSUSE) = 20210525-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -551,10 +551,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF openSUSE openSUSE - 20210524 + 20210525 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20210524 + cpe:/o:opensuse:opensuse:20210525 openSUSE diff --git a/weakremovers.inc b/weakremovers.inc index 5d023db..65ee1c2 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -4275,6 +4275,7 @@ Provides: weakremover(euca2ools) Provides: weakremover(evolution-data-server-doc) Provides: weakremover(exo-helpers) Provides: weakremover(explain) +Provides: weakremover(f2fs-tools-compat) Provides: weakremover(fate) Provides: weakremover(fcitx-qt4) Provides: weakremover(feedreader) @@ -8703,6 +8704,7 @@ Provides: weakremover(jupyter-ipykernel-doc) Provides: weakremover(jupyter-ipykernel-python2) Provides: weakremover(jupyter-ipyparallel-doc) Provides: weakremover(jupyter-jupyter-core-doc) +Provides: weakremover(jupyter-jupyter-require) Provides: weakremover(jupyter-jupyter_client-doc) Provides: weakremover(jupyter-jupyter_core-doc) Provides: weakremover(jupyter-nbpresent) @@ -18059,6 +18061,7 @@ Provides: weakremover(python3-jsonpath-rw-ext) Provides: weakremover(python3-jupyter) Provides: weakremover(python3-jupyter-datatables) Provides: weakremover(python3-jupyter-doc) +Provides: weakremover(python3-jupyter-require) Provides: weakremover(python3-jupyter_Video_Widget) Provides: weakremover(python3-jupyter_hide_code) Provides: weakremover(python3-jupyter_ipydatawidgets_jupyterlab) @@ -18324,6 +18327,7 @@ Provides: weakremover(python36-jplephem) Provides: weakremover(python36-json_tricks) Provides: weakremover(python36-jsonextended) Provides: weakremover(python36-jupyter-datatables) +Provides: weakremover(python36-jupyter-require) Provides: weakremover(python36-lazyarray) Provides: weakremover(python36-lfdfiles) Provides: weakremover(python36-librosa) @@ -18483,6 +18487,7 @@ Provides: weakremover(python38-dtaidistance-devel) Provides: weakremover(python38-featureflow) Provides: weakremover(python38-flask-jwt-extended) Provides: weakremover(python38-jupyter-datatables) +Provides: weakremover(python38-jupyter-require) Provides: weakremover(python38-missingno) Provides: weakremover(python38-numpy_1_19_5-gnu-hpc) Provides: weakremover(python38-numpy_1_19_5-gnu-hpc-devel) @@ -25936,6 +25941,7 @@ Provides: weakremover(scratch-devel) Provides: weakremover(scratch-lang) Provides: weakremover(screenshot-tool) Provides: weakremover(screenshot-tool-lang) +Provides: weakremover(scsh) Provides: weakremover(sdlscavenger) Provides: weakremover(segv_handler) Provides: weakremover(semi-xemacs)