diff --git a/MicroOS-release.spec b/MicroOS-release.spec index 99cfc902..4153c1a6 100644 --- a/MicroOS-release.spec +++ b/MicroOS-release.spec @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20210710 +Version: 20210711 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) = 20210710-0 +Provides: product(MicroOS) = 20210711-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210710 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210711 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) = 20210710-0 +Provides: product_flavor(MicroOS) = 20210711-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) = 20210710-0 +Provides: product_flavor(MicroOS) = 20210711-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) = 20210710-0 +Provides: product_flavor(MicroOS) = 20210711-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) = 20210710-0 +Provides: product_flavor(MicroOS) = 20210711-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -301,11 +301,11 @@ cat >%{buildroot}%{_sysconfdir}/products.d/MicroOS.prod << EOF openSUSE MicroOS - 20210710 + 20210711 0 %{_target_cpu} - cpe:/o:opensuse:microos:20210710 + cpe:/o:opensuse:microos:20210711 MicroOS diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index 6a98ef11..023db309 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 20210710) +# spec file for package openSUSE-Addon-NonOss-release (Version 20210711) # # 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: 20210710 +Version: 20210711 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20210710-0 +Provides: product(openSUSE-Addon-NonOss) = 20210711-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210710 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210711 AutoReqProv: on @@ -48,10 +48,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20210710 + 20210711 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20210710 + cpe:/o:opensuse:opensuse-addon-nonoss:20210711 diff --git a/openSUSE-release.spec b/openSUSE-release.spec index 1839efae..4a2506ad 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20210710 +Version: 20210711 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) = 20210710-0 +Provides: product(openSUSE) = 20210711-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%3A20210710 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210711 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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-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) = 20210710-0 +Provides: product_flavor(openSUSE) = 20210711-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -551,10 +551,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE.prod << EOF openSUSE openSUSE - 20210710 + 20210711 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20210710 + cpe:/o:opensuse:opensuse:20210711 openSUSE diff --git a/weakremovers.inc b/weakremovers.inc index 14ad92be..8fea52ff 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -1824,11 +1824,6 @@ Provides: weakremover(calendarsupport) Provides: weakremover(calendarsupport-devel) Provides: weakremover(chromedriver) Provides: weakremover(chromium) -Provides: weakremover(cilium) -Provides: weakremover(cilium-cni) -Provides: weakremover(cilium-devel) -Provides: weakremover(cilium-docker) -Provides: weakremover(cilium-operator) Provides: weakremover(cilium-proxy) Provides: weakremover(clipgrab) Provides: weakremover(cluster-md-kmp-64kb) @@ -1993,7 +1988,6 @@ Provides: weakremover(libc++-devel) Provides: weakremover(libc++1) Provides: weakremover(libc++abi-devel) Provides: weakremover(libc++abi1) -Provides: weakremover(libcilium1) Provides: weakremover(libdrm_etnaviv1) Provides: weakremover(libdrm_exynos1) Provides: weakremover(libdrm_freedreno1) @@ -8128,8 +8122,6 @@ Provides: weakremover(libkdegames-devel) Provides: weakremover(libkdepim) Provides: weakremover(libkdepim-devel) Provides: weakremover(libkdevplatform56) -Provides: weakremover(libkdsoap-server1_9_0) -Provides: weakremover(libkdsoap1_9_0) Provides: weakremover(libkdstatemachineeditor_debuginterfacesource-static) Provides: weakremover(libkdumpfile-devel) Provides: weakremover(libkea1_4) @@ -19694,7 +19686,13 @@ Provides: weakremover(cg) Provides: weakremover(cg-devel) Provides: weakremover(chameleon) Provides: weakremover(chrome-theme-adapta) +Provides: weakremover(cilium) +Provides: weakremover(cilium-cni) +Provides: weakremover(cilium-devel) +Provides: weakremover(cilium-docker) +Provides: weakremover(cilium-k8s-yaml) Provides: weakremover(cilium-microscope) +Provides: weakremover(cilium-operator) Provides: weakremover(cimple) Provides: weakremover(cimple-cmpi-adapter) Provides: weakremover(cimple-devel) @@ -25176,6 +25174,7 @@ Provides: weakremover(libcfitsio7) Provides: weakremover(libcfitsio8) Provides: weakremover(libcgns3_4) Provides: weakremover(libcgns3_4_1) +Provides: weakremover(libcilium1) Provides: weakremover(libcilkrts5-gcc6) Provides: weakremover(libcint3) Provides: weakremover(libcivetweb1_11_0) @@ -32092,6 +32091,7 @@ Provides: weakremover(python36-xsge_tmx) Provides: weakremover(python36-yafe) Provides: weakremover(python36-yt) Provides: weakremover(python36-zarr) +Provides: weakremover(python36-zeep) Provides: weakremover(python36-zignal) Provides: weakremover(python38-HyperKitty) Provides: weakremover(python38-PyGetWindow) @@ -41003,6 +41003,8 @@ Provides: weakremover(libkcserver0) Provides: weakremover(libkcsoap0) Provides: weakremover(libkcutil0) Provides: weakremover(libkdecorations2private7) +Provides: weakremover(libkdsoap-server1_9_0) +Provides: weakremover(libkdsoap1_9_0) Provides: weakremover(libkdstatemachineeditor_core1_2_7) Provides: weakremover(libkdstatemachineeditor_debuginterfaceclient1_2_7) Provides: weakremover(libkdstatemachineeditor_view1_2_7)