diff --git a/.files b/.files index 68a4e5f..10d3ca1 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 76d856d..db64ec4 100644 --- a/.rev +++ b/.rev @@ -7497,4 +7497,11 @@ staging-bot Automatic update + + e1fa90fa7669c540bb6561762aa36c3f + unknown + + staging-bot + Automatic update + diff --git a/.servicemark b/.servicemark index 593de8d..b38327a 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -2afaeed30e90ec3e519b27c1c7d082c6 +8dd283b88af8a2d4c35450b9864bcd33 diff --git a/MicroOS-release.spec b/MicroOS-release.spec index a0db80f..cc8213c 100644 --- a/MicroOS-release.spec +++ b/MicroOS-release.spec @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20210720 +Version: 20210721 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) = 20210720-0 +Provides: product(MicroOS) = 20210721-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210720 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210721 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) = 20210720-0 +Provides: product_flavor(MicroOS) = 20210721-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) = 20210720-0 +Provides: product_flavor(MicroOS) = 20210721-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) = 20210720-0 +Provides: product_flavor(MicroOS) = 20210721-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) = 20210720-0 +Provides: product_flavor(MicroOS) = 20210721-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -299,11 +299,11 @@ cat >%{buildroot}%{_sysconfdir}/products.d/MicroOS.prod << EOF openSUSE MicroOS - 20210720 + 20210721 0 %{_target_cpu} - cpe:/o:opensuse:microos:20210720 + cpe:/o:opensuse:microos:20210721 MicroOS diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index 86d87a5..3b9e1af 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 20210720) +# spec file for package openSUSE-Addon-NonOss-release (Version 20210721) # # 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: 20210720 +Version: 20210721 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20210720-0 +Provides: product(openSUSE-Addon-NonOss) = 20210721-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210720 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210721 AutoReqProv: on @@ -48,10 +48,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20210720 + 20210721 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20210720 + cpe:/o:opensuse:opensuse-addon-nonoss:20210721 diff --git a/openSUSE-release.spec b/openSUSE-release.spec index 49047a6..d842110 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20210720 +Version: 20210721 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) = 20210720-0 +Provides: product(openSUSE) = 20210721-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%3A20210720 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210721 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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-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) = 20210720-0 +Provides: product_flavor(openSUSE) = 20210721-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -552,10 +552,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE.prod << EOF openSUSE openSUSE - 20210720 + 20210721 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20210720 + cpe:/o:opensuse:opensuse:20210721 openSUSE diff --git a/weakremovers.inc b/weakremovers.inc index 776c1aa..7f6561c 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -1857,8 +1857,6 @@ Provides: weakremover(dtb-sprd) Provides: weakremover(dtb-xilinx) Provides: weakremover(dtb-zte) Provides: weakremover(dub) -Provides: weakremover(envoy-proxy) -Provides: weakremover(envoy-proxy-source) Provides: weakremover(eventviews) Provides: weakremover(eventviews-devel) Provides: weakremover(falkon) @@ -15337,7 +15335,6 @@ Provides: weakremover(python2-zopfli) Provides: weakremover(python3-dmidecode) Provides: weakremover(python3-gpgme) Provides: weakremover(python3-gssapi) -Provides: weakremover(python3-simplejson) Provides: weakremover(python3-uyuni-common-libs) Provides: weakremover(reiserfs-kmp-default) Provides: weakremover(rpm-ndb) @@ -19822,6 +19819,8 @@ Provides: weakremover(enlightenment-doc-html) Provides: weakremover(enlightenment-theme-cerium2) Provides: weakremover(enlightenment-theme-openSUSE-oliveleaf) Provides: weakremover(envoy-protoc-gen-validate-source) +Provides: weakremover(envoy-proxy) +Provides: weakremover(envoy-proxy-source) Provides: weakremover(epydoc) Provides: weakremover(erlang-gs) Provides: weakremover(erlang-gs-src) @@ -28420,6 +28419,8 @@ Provides: weakremover(python-Sphinx-doc) Provides: weakremover(python-Sphinx-doc-man-common) Provides: weakremover(python-Sphinx1-doc-html) Provides: weakremover(python-Sphinx1-doc-man) +Provides: weakremover(python-Sphinx2-doc-html) +Provides: weakremover(python-Sphinx2-doc-man) Provides: weakremover(python-Trolly) Provides: weakremover(python-Twisted) Provides: weakremover(python-UcsSdk) @@ -31564,6 +31565,8 @@ Provides: weakremover(python3-Quandl) Provides: weakremover(python3-Sphinx-doc) Provides: weakremover(python3-Sphinx-doc-man) Provides: weakremover(python3-Sphinx-test) +Provides: weakremover(python3-Sphinx2) +Provides: weakremover(python3-Sphinx2-latex) Provides: weakremover(python3-Twisted-doc) Provides: weakremover(python3-amqplib) Provides: weakremover(python3-apsw-doc) @@ -31606,6 +31609,7 @@ Provides: weakremover(python3-cursive) Provides: weakremover(python3-discover) Provides: weakremover(python3-django-action-framework) Provides: weakremover(python3-django-allauth-lang) +Provides: weakremover(python3-django-args) Provides: weakremover(python3-django-babel) Provides: weakremover(python3-django-celery) Provides: weakremover(python3-django-parler) @@ -31812,6 +31816,8 @@ Provides: weakremover(python36-PyRect) Provides: weakremover(python36-PyWavelets) Provides: weakremover(python36-Pydap) Provides: weakremover(python36-SoundCard) +Provides: weakremover(python36-Sphinx2) +Provides: weakremover(python36-Sphinx2-latex) Provides: weakremover(python36-Theano) Provides: weakremover(python36-Transplant) Provides: weakremover(python36-acoular) @@ -31871,6 +31877,7 @@ Provides: weakremover(python36-deepdiff) Provides: weakremover(python36-distob) Provides: weakremover(python36-distributed) Provides: weakremover(python36-django-action-framework) +Provides: weakremover(python36-django-args) Provides: weakremover(python36-django-import-export) Provides: weakremover(python36-django-pandas) Provides: weakremover(python36-django-parler) @@ -32098,6 +32105,8 @@ Provides: weakremover(python36-zeep) Provides: weakremover(python36-zignal) Provides: weakremover(python38-HyperKitty) Provides: weakremover(python38-PyGetWindow) +Provides: weakremover(python38-Sphinx2) +Provides: weakremover(python38-Sphinx2-latex) Provides: weakremover(python38-ara) Provides: weakremover(python38-avocado-plugins-vt) Provides: weakremover(python38-bcolz) @@ -32106,6 +32115,7 @@ Provides: weakremover(python38-bump2version) Provides: weakremover(python38-casacore) Provides: weakremover(python38-cluster-preflight-check) Provides: weakremover(python38-django-action-framework) +Provides: weakremover(python38-django-args) Provides: weakremover(python38-django-parler) Provides: weakremover(python38-django-threadedcomments) Provides: weakremover(python38-dogpile.cache) @@ -32141,6 +32151,7 @@ Provides: weakremover(python39-avocado-plugins-vt) Provides: weakremover(python39-blindspin) Provides: weakremover(python39-casacore) Provides: weakremover(python39-django-action-framework) +Provides: weakremover(python39-django-args) Provides: weakremover(python39-django-parler) Provides: weakremover(python39-django-threadedcomments) Provides: weakremover(python39-numpy_1_20_1-gnu-hpc) @@ -45615,6 +45626,7 @@ Provides: weakremover(python22-scipy-gnu-hpc) Provides: weakremover(python3-32bit) Provides: weakremover(python3-PeachPy) Provides: weakremover(python3-base-32bit) +Provides: weakremover(python3-keras2onnx) Provides: weakremover(python3-lldb4) Provides: weakremover(python3-lldb5) Provides: weakremover(python3-lldb6)