diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index 7dd831f8..b247f4bf 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 20200617) +# spec file for package openSUSE-Addon-NonOss-release (Version 20200618) # # 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: 20200617 +Version: 20200618 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20200617-0 +Provides: product(openSUSE-Addon-NonOss) = 20200618-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20200617 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20200618 AutoReqProv: on @@ -49,10 +49,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20200617 + 20200618 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20200617 + cpe:/o:opensuse:opensuse-addon-nonoss:20200618 diff --git a/openSUSE-MicroOS-release.spec b/openSUSE-MicroOS-release.spec index da83256c..bf04f3b9 100644 --- a/openSUSE-MicroOS-release.spec +++ b/openSUSE-MicroOS-release.spec @@ -1,7 +1,7 @@ # # spec file for package openSUSE-MicroOS-release.spec # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: openSUSE-MicroOS-release -Version: 20200617 +Version: 20200618 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -42,8 +42,6 @@ Provides: product-update() = dup # With more than one product in the FTP tree, yast needs to know which products are installable # The name is referenced by the control file as well Provides: system-installation() = openSUSE-MicroOS -# this package should only be available for the "basearchs" of a product -ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 %arm # bnc#826592 Provides: weakremover(kernel-default) < 3.11 Provides: weakremover(kernel-desktop) < 4.2 @@ -168,12 +166,14 @@ Provides: weakremover(libxtables11) Provides: weakremover(libzip4) Provides: weakremover(mt_st) Provides: weakremover(openssl-debuginfo) +# this package should only be available for the "basearchs" of a product +ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 %arm %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE-MicroOS -Provides: product(openSUSE-MicroOS) = 20200617-0 +Provides: product(openSUSE-MicroOS) = 20200618-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20200617 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20200618 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) @@ -189,7 +189,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20200617-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200618-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -205,7 +205,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(kubic-dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20200617-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200618-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description kubic-dvd @@ -221,7 +221,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE-MicroOS) = 20200617-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200618-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -237,7 +237,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kubic) -Provides: product_flavor(openSUSE-MicroOS) = 20200617-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200618-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -295,11 +295,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-MicroOS.prod << EOF openSUSE openSUSE-MicroOS - 20200617 + 20200618 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-microos:20200617 + cpe:/o:opensuse:opensuse-microos:20200618 openSUSE-MicroOS diff --git a/openSUSE-release.spec b/openSUSE-release.spec index 30287a5b..2c3cfff6 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -1,7 +1,7 @@ # # spec file for package openSUSE-release.spec # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20200617 +Version: 20200618 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -31,10 +31,10 @@ BuildRequires: skelcd-control-openSUSE BuildRequires: skelcd-openSUSE Suggests: branding-openSUSE Suggests: distribution-logos-openSUSE-Tumbleweed -Suggests: openSUSE-build-key Suggests: java-11-openjdk Suggests: mariadb Suggests: mariadb-client +Suggests: openSUSE-build-key Suggests: openssl-1_1 Conflicts: core-release <= 10 Conflicts: distribution-release @@ -178,7 +178,7 @@ Provides: weakremover(openssl-debuginfo) %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20200617-0 +Provides: product(openSUSE) = 20200618-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%3A20200617 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20200618 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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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) = 20200617-0 +Provides: product_flavor(openSUSE) = 20200618-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 - 20200617 + 20200618 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20200617 + cpe:/o:opensuse:opensuse:20200618 openSUSE diff --git a/weakremovers.inc b/weakremovers.inc index b574986d..9f8b4dbd 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -16763,7 +16763,6 @@ Provides: weakremover(python3-libunity) Provides: weakremover(python3-lxml-doc) Provides: weakremover(python3-matplotlib-qt4) Provides: weakremover(python3-microversion_parse) -Provides: weakremover(python3-mitmproxy) Provides: weakremover(python3-mpmath-doc) Provides: weakremover(python3-nagios-http-json) Provides: weakremover(python3-numpy_1_13_3-gnu-hpc)