diff --git a/.files b/.files index d7aa543..035f08b 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 26e30e0..4c620fa 100644 --- a/.rev +++ b/.rev @@ -4073,4 +4073,11 @@ staging-bot Automatic update + + 50dfbc76ca606cb929693c733314d38a + unknown + + staging-bot + Automatic update + diff --git a/.servicemark b/.servicemark index d0ddf07..0d81123 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -0caf45c2a2f37d1aaf7e25bf70f1c59d +5833720467fb8926c074bed1c0ff7a36 diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index 66eedc7..c460ff5 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 20200607) +# spec file for package openSUSE-Addon-NonOss-release (Version 20200609) # # 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: 20200607 +Version: 20200609 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20200607-0 +Provides: product(openSUSE-Addon-NonOss) = 20200609-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20200607 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20200609 AutoReqProv: on @@ -49,10 +49,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20200607 + 20200609 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20200607 + cpe:/o:opensuse:opensuse-addon-nonoss:20200609 diff --git a/openSUSE-MicroOS-release.spec b/openSUSE-MicroOS-release.spec index 4116353..b668f58 100644 --- a/openSUSE-MicroOS-release.spec +++ b/openSUSE-MicroOS-release.spec @@ -17,7 +17,7 @@ Name: openSUSE-MicroOS-release -Version: 20200607 +Version: 20200609 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -37,6 +37,8 @@ Provides: distribution-release # MicroOS-release replaces Tumbleweed-Kubic-release Provides: openSUSE-Tumbleweed-Kubic-release Obsoletes: openSUSE-Tumbleweed-Kubic-release <= 20190324 +# Give zypp a hint that this product must be kept up-to-date using zypper dup, not up (boo#1061384) +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 @@ -169,9 +171,9 @@ Provides: weakremover(openssl-debuginfo) %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE-MicroOS -Provides: product(openSUSE-MicroOS) = 20200607-0 +Provides: product(openSUSE-MicroOS) = 20200609-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20200607 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20200609 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) @@ -187,7 +189,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20200607-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200609-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -203,7 +205,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(kubic-dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20200607-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200609-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description kubic-dvd @@ -219,7 +221,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE-MicroOS) = 20200607-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200609-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -235,7 +237,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kubic) -Provides: product_flavor(openSUSE-MicroOS) = 20200607-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200609-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -293,11 +295,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-MicroOS.prod << EOF openSUSE openSUSE-MicroOS - 20200607 + 20200609 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-microos:20200607 + cpe:/o:opensuse:opensuse-microos:20200609 openSUSE-MicroOS diff --git a/openSUSE-release.spec b/openSUSE-release.spec index 333c27b..100bea4 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20200607 +Version: 20200609 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) = 20200607-0 +Provides: product(openSUSE) = 20200609-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%3A20200607 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20200609 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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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) = 20200607-0 +Provides: product_flavor(openSUSE) = 20200609-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 - 20200607 + 20200609 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20200607 + cpe:/o:opensuse:opensuse:20200609 openSUSE diff --git a/weakremovers.inc b/weakremovers.inc index 86c98a0..3efce74 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -9359,7 +9359,9 @@ Provides: weakremover(libMagickWand-7_Q16HDRI5) Provides: weakremover(libMagickWand-7_Q16HDRI6) Provides: weakremover(libMyGUIEngine3) Provides: weakremover(libOpenImageIO1_7) +Provides: weakremover(libOpenImageIO1_8) Provides: weakremover(libOpenImageIO_Util1_7) +Provides: weakremover(libOpenImageIO_Util1_8) Provides: weakremover(libOpenSceneGraph130) Provides: weakremover(libPocoCppParser63) Provides: weakremover(libPocoCrypto63) @@ -10918,9 +10920,13 @@ Provides: weakremover(liborigin0) Provides: weakremover(liborigin2) Provides: weakremover(libortp13) Provides: weakremover(libosdCPU3_4_0) +Provides: weakremover(liboslcomp1_10) Provides: weakremover(liboslcomp1_9) +Provides: weakremover(liboslexec1_10) Provides: weakremover(liboslexec1_9) +Provides: weakremover(liboslnoise1_10) Provides: weakremover(liboslnoise1_9) +Provides: weakremover(liboslquery1_10) Provides: weakremover(liboslquery1_9) Provides: weakremover(libosmcomp3) Provides: weakremover(libosmcomp4) @@ -11060,6 +11066,7 @@ Provides: weakremover(libpoppler91) Provides: weakremover(libpoppler94) Provides: weakremover(libpoppler97) Provides: weakremover(libpoppler98) +Provides: weakremover(libpoppler99) Provides: weakremover(libpostproc53) Provides: weakremover(libpostproc54) Provides: weakremover(libpqos0) @@ -11145,6 +11152,7 @@ Provides: weakremover(libqpdf17) Provides: weakremover(libqpdf18) Provides: weakremover(libqpdf21) Provides: weakremover(libqpdf26) +Provides: weakremover(libqpid-proton-cpp10) Provides: weakremover(libqrencode3) Provides: weakremover(libqross0_1) Provides: weakremover(libqrosspython) @@ -11341,6 +11349,7 @@ Provides: weakremover(libtelepathy-qt4-farstream2) Provides: weakremover(libtelepathy-qt5-service0) Provides: weakremover(libtepl-3-0) Provides: weakremover(libtesseract3) +Provides: weakremover(libtestshade1_10) Provides: weakremover(libtestshade1_9) Provides: weakremover(libtexlua52-5) Provides: weakremover(libthrift-0_10_0) @@ -12245,6 +12254,7 @@ Provides: weakremover(octave-forge-octproj) Provides: weakremover(offlineimap) Provides: weakremover(offlineimap-htmldoc) Provides: weakremover(ohpc) +Provides: weakremover(open-vm-tools-sdmp) Provides: weakremover(openSUSE-Addon-NonOss-release-addon-nonoss) Provides: weakremover(openSUSE-Addon-NonOss-release-ftp) Provides: weakremover(openSUSE-Tumbleweed-Kubic-release) @@ -12362,6 +12372,7 @@ Provides: weakremover(orbit2) Provides: weakremover(orbit2-devel) Provides: weakremover(orbit2-doc) Provides: weakremover(osdkeys) +Provides: weakremover(osl.imageio1_10) Provides: weakremover(osl.imageio1_9) Provides: weakremover(osmo) Provides: weakremover(osmo-lang) @@ -12583,6 +12594,7 @@ Provides: weakremover(perl-camgm) Provides: weakremover(perl-gdal2) Provides: weakremover(perl-getdata) Provides: weakremover(perl-qpid) +Provides: weakremover(perl-qpid-proton) Provides: weakremover(perl-qt4) Provides: weakremover(perl-qt4-devel) Provides: weakremover(petsc-openmpi-devel) @@ -13768,6 +13780,7 @@ Provides: weakremover(python-veusz) Provides: weakremover(python-vips) Provides: weakremover(python-virtkey) Provides: weakremover(python-virtualenvwrapper) +Provides: weakremover(python-volatility) Provides: weakremover(python-voluptuous) Provides: weakremover(python-vte) Provides: weakremover(python-wadllib) @@ -22490,6 +22503,7 @@ Provides: weakremover(libpoppler91-32bit) Provides: weakremover(libpoppler94-32bit) Provides: weakremover(libpoppler97-32bit) Provides: weakremover(libpoppler98-32bit) +Provides: weakremover(libpoppler99-32bit) Provides: weakremover(libpostproc53-32bit) Provides: weakremover(libpostproc54-32bit) Provides: weakremover(libprison0-32bit)