diff --git a/.files b/.files index debc78c..d4f87b0 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index b95e676..449cf9d 100644 --- a/.rev +++ b/.rev @@ -2617,4 +2617,11 @@ staging-bot Automatic update + + e4427a7696a525e8f9e0fe6f8387369c + unknown + + staging-bot + Automatic update + diff --git a/.servicemark b/.servicemark index 2a4a173..a8e5f42 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -01a9164049320e9b917f66f8cd6b30ad +921816b3d041ccf369a29ff29a23e978 diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index d3e3a18..957b0d1 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 20191230) +# spec file for package openSUSE-Addon-NonOss-release (Version 20191231) # # 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: 20191230 +Version: 20191231 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20191230-0 +Provides: product(openSUSE-Addon-NonOss) = 20191231-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20191230 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20191231 AutoReqProv: on @@ -49,10 +49,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20191230 + 20191231 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20191230 + cpe:/o:opensuse:opensuse-addon-nonoss:20191231 diff --git a/openSUSE-MicroOS-release.spec b/openSUSE-MicroOS-release.spec index 4a9f4df..ca17522 100644 --- a/openSUSE-MicroOS-release.spec +++ b/openSUSE-MicroOS-release.spec @@ -17,7 +17,7 @@ Name: openSUSE-MicroOS-release -Version: 20191230 +Version: 20191231 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) = 20191230-0 +Provides: product(openSUSE-MicroOS) = 20191231-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20191230 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20191231 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) = 20191230-0 +Provides: product_flavor(openSUSE-MicroOS) = 20191231-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) = 20191230-0 +Provides: product_flavor(openSUSE-MicroOS) = 20191231-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) = 20191230-0 +Provides: product_flavor(openSUSE-MicroOS) = 20191231-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) = 20191230-0 +Provides: product_flavor(openSUSE-MicroOS) = 20191231-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 - 20191230 + 20191231 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-microos:20191230 + cpe:/o:opensuse:opensuse-microos:20191231 openSUSE-MicroOS diff --git a/openSUSE-release.spec b/openSUSE-release.spec index 3f04626..8d54af9 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20191230 +Version: 20191231 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -182,7 +182,7 @@ Provides: weakremover(openssl-debuginfo) %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20191230-0 +Provides: product(openSUSE) = 20191231-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -196,7 +196,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%3A20191230 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20191231 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) @@ -210,7 +210,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description ftp @@ -225,7 +225,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description mini @@ -240,7 +240,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description dvd @@ -255,7 +255,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-kde @@ -270,7 +270,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-x11 @@ -285,7 +285,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-gnome @@ -300,7 +300,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-xfce @@ -315,7 +315,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-kde @@ -330,7 +330,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-gnome @@ -345,7 +345,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-x11 @@ -360,7 +360,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance @@ -375,7 +375,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-docker) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-docker @@ -390,7 +390,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kvm) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-kvm @@ -405,7 +405,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vmware) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vmware @@ -420,7 +420,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-openstack) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-openstack @@ -435,7 +435,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-hyperv) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-hyperv @@ -450,7 +450,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vagrant) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vagrant @@ -465,7 +465,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-wsl) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-wsl @@ -480,7 +480,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-custom) -Provides: product_flavor(openSUSE) = 20191230-0 +Provides: product_flavor(openSUSE) = 20191231-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -554,10 +554,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF openSUSE openSUSE - 20191230 + 20191231 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20191230 + cpe:/o:opensuse:opensuse:20191231 openSUSE diff --git a/weakremovers.inc b/weakremovers.inc index 9dc9c5b..ffb9757 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -12496,6 +12496,8 @@ Provides: weakremover(gnome-commander-doc) Provides: weakremover(gnome-commander-lang) Provides: weakremover(gnome-desktop-sharp2) Provides: weakremover(gnome-desktop-sharp2-devel) +Provides: weakremover(gnome-desktop2) +Provides: weakremover(gnome-desktop2-lang) Provides: weakremover(gnome-do) Provides: weakremover(gnome-do-lang) Provides: weakremover(gnome-do-plugins) @@ -14130,6 +14132,8 @@ Provides: weakremover(libglslang-suse6) Provides: weakremover(libglslang-suse7) Provides: weakremover(libgmm++-devel) Provides: weakremover(libgnome) +Provides: weakremover(libgnome-desktop-2-17) +Provides: weakremover(libgnome-desktop-2-devel) Provides: weakremover(libgnome-desktop-3-12) Provides: weakremover(libgnome-desktop-3-17) Provides: weakremover(libgnome-devel) @@ -22584,6 +22588,7 @@ Provides: weakremover(libglibmm-2_58-1-32bit) Provides: weakremover(libglibmm-2_60-1-32bit) Provides: weakremover(libgloox15-32bit) Provides: weakremover(libgnome-32bit) +Provides: weakremover(libgnome-desktop-2-17-32bit) Provides: weakremover(libgnome-desktop-3-12-32bit) Provides: weakremover(libgnome-desktop-3-17-32bit) Provides: weakremover(libgnomecups-1_0-1-32bit)