diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index 80ad8dfb..a3abbfe9 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 20191116) +# spec file for package openSUSE-Addon-NonOss-release (Version 20191117) # # Copyright (c) 2019 openSUSE. # @@ -16,16 +16,16 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}} -Version: 20191116 +Version: 20191117 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20191116-0 +Provides: product(openSUSE-Addon-NonOss) = 20191117-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20191116 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20191117 AutoReqProv: on @@ -49,10 +49,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20191116 + 20191117 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20191116 + cpe:/o:opensuse:opensuse-addon-nonoss:20191117 diff --git a/openSUSE-MicroOS-release.spec b/openSUSE-MicroOS-release.spec index e7f7690b..b2f9f8f7 100644 --- a/openSUSE-MicroOS-release.spec +++ b/openSUSE-MicroOS-release.spec @@ -17,7 +17,7 @@ Name: openSUSE-MicroOS-release -Version: 20191116 +Version: 20191117 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -43,9 +43,9 @@ Provides: system-installation() = openSUSE-MicroOS ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 %arm Provides: %name-%version Provides: product() = openSUSE-MicroOS -Provides: product(openSUSE-MicroOS) = 20191116-0 +Provides: product(openSUSE-MicroOS) = 20191117-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20191116 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20191117 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) @@ -61,7 +61,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20191116-0 +Provides: product_flavor(openSUSE-MicroOS) = 20191117-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -77,7 +77,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(kubic-dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20191116-0 +Provides: product_flavor(openSUSE-MicroOS) = 20191117-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description kubic-dvd @@ -93,7 +93,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE-MicroOS) = 20191116-0 +Provides: product_flavor(openSUSE-MicroOS) = 20191117-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -109,7 +109,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kubic) -Provides: product_flavor(openSUSE-MicroOS) = 20191116-0 +Provides: product_flavor(openSUSE-MicroOS) = 20191117-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -167,11 +167,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-MicroOS.prod << EOF openSUSE openSUSE-MicroOS - 20191116 + 20191117 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-microos:20191116 + cpe:/o:opensuse:opensuse-microos:20191117 openSUSE-MicroOS diff --git a/openSUSE-release.spec b/openSUSE-release.spec index d8132143..b0a24ee9 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20191116 +Version: 20191117 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -55,7 +55,7 @@ Provides: system-installation() = openSUSE Obsoletes: aaa_version Obsoletes: openSUSE-Promo-release <= 11.1 Obsoletes: openSUSE-release-live <= 11.0 -Obsoletes: product_flavor(%{product}) < 20191116 +Obsoletes: product_flavor(%{product}) < 20191117 # bnc#826592 Provides: weakremover(kernel-default) < 3.11 Provides: weakremover(kernel-desktop) < 4.2 @@ -183,7 +183,7 @@ Provides: weakremover(openssl-debuginfo) %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20191116-0 +Provides: product(openSUSE) = 20191117-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -197,7 +197,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%3A20191116 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20191117 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) @@ -211,7 +211,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description ftp @@ -226,7 +226,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description mini @@ -241,7 +241,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description dvd @@ -256,7 +256,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-kde @@ -271,7 +271,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-x11 @@ -286,7 +286,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-gnome @@ -301,7 +301,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-xfce @@ -316,7 +316,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-kde @@ -331,7 +331,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-gnome @@ -346,7 +346,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-x11 @@ -361,7 +361,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance @@ -376,7 +376,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-docker) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-docker @@ -391,7 +391,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kvm) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-kvm @@ -406,7 +406,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vmware) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vmware @@ -421,7 +421,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-openstack) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-openstack @@ -436,7 +436,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-hyperv) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-hyperv @@ -451,7 +451,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vagrant) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vagrant @@ -466,7 +466,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-wsl) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-wsl @@ -481,7 +481,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-custom) -Provides: product_flavor(openSUSE) = 20191116-0 +Provides: product_flavor(openSUSE) = 20191117-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -555,10 +555,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF openSUSE openSUSE - 20191116 + 20191117 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20191116 + cpe:/o:opensuse:opensuse:20191117 openSUSE diff --git a/weakremovers.inc b/weakremovers.inc index bc66b07e..c2877d67 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -250,8 +250,6 @@ Provides: weakremover(fftw3-threads) Provides: weakremover(findbugs-manual) Provides: weakremover(firebird-filesystem) Provides: weakremover(freeglut) -Provides: weakremover(freemarker) -Provides: weakremover(freemarker-javadoc) Provides: weakremover(freemarker-manual) Provides: weakremover(gcalctool) Provides: weakremover(gcalctool-lang) @@ -14269,6 +14267,7 @@ Provides: weakremover(libical-devel-static) Provides: weakremover(libical2) Provides: weakremover(libicu-suse63_1) Provides: weakremover(libicu-suse64_1) +Provides: weakremover(libicu-suse64_2) Provides: weakremover(libicu59_1) Provides: weakremover(libicu59_1-bedata) Provides: weakremover(libicu59_1-ledata) @@ -14279,6 +14278,8 @@ Provides: weakremover(libicu63_1-bedata) Provides: weakremover(libicu63_1-ledata) Provides: weakremover(libicu64_1-bedata) Provides: weakremover(libicu64_1-ledata) +Provides: weakremover(libicu64_2-bedata) +Provides: weakremover(libicu64_2-ledata) Provides: weakremover(libidn11) Provides: weakremover(libidn2-4) Provides: weakremover(libidnkit1) @@ -22126,6 +22127,7 @@ Provides: weakremover(libibnetdisc5-32bit) Provides: weakremover(libical2-32bit) Provides: weakremover(libicu-suse63_1-32bit) Provides: weakremover(libicu-suse64_1-32bit) +Provides: weakremover(libicu-suse64_2-32bit) Provides: weakremover(libicu59_1-32bit) Provides: weakremover(libicu60_2-32bit) Provides: weakremover(libidn11-32bit)