diff --git a/.files b/.files index 7bd5812..37e1273 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index f518a45..ce0872a 100644 --- a/.rev +++ b/.rev @@ -4010,4 +4010,11 @@ staging-bot Automatic update + + e1ca7b2b060acc4ae71cd093121d9037 + unknown + + staging-bot + Automatic update + diff --git a/.servicemark b/.servicemark index 4f6e0f3..146807c 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -ed6cb1362e47d10e69ee10feb11b0b05 +c75910802207d290103cfdaf39a5499c diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index 413bb32..65e96d0 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 20200530) +# spec file for package openSUSE-Addon-NonOss-release (Version 20200602) # # 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: 20200530 +Version: 20200602 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20200530-0 +Provides: product(openSUSE-Addon-NonOss) = 20200602-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20200530 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20200602 AutoReqProv: on @@ -49,10 +49,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20200530 + 20200602 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20200530 + cpe:/o:opensuse:opensuse-addon-nonoss:20200602 diff --git a/openSUSE-MicroOS-release.spec b/openSUSE-MicroOS-release.spec index a4529a6..4a083ab 100644 --- a/openSUSE-MicroOS-release.spec +++ b/openSUSE-MicroOS-release.spec @@ -17,7 +17,7 @@ Name: openSUSE-MicroOS-release -Version: 20200530 +Version: 20200602 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -169,9 +169,9 @@ Provides: weakremover(openssl-debuginfo) %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE-MicroOS -Provides: product(openSUSE-MicroOS) = 20200530-0 +Provides: product(openSUSE-MicroOS) = 20200602-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20200530 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20200602 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 +187,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20200530-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200602-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -203,7 +203,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(kubic-dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20200530-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200602-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description kubic-dvd @@ -219,7 +219,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE-MicroOS) = 20200530-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200602-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -235,7 +235,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kubic) -Provides: product_flavor(openSUSE-MicroOS) = 20200530-0 +Provides: product_flavor(openSUSE-MicroOS) = 20200602-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -293,11 +293,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-MicroOS.prod << EOF openSUSE openSUSE-MicroOS - 20200530 + 20200602 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-microos:20200530 + cpe:/o:opensuse:opensuse-microos:20200602 openSUSE-MicroOS diff --git a/openSUSE-release.spec b/openSUSE-release.spec index 9b6a345..5597e6f 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20200530 +Version: 20200602 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) = 20200530-0 +Provides: product(openSUSE) = 20200602-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%3A20200530 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20200602 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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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) = 20200530-0 +Provides: product_flavor(openSUSE) = 20200602-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 - 20200530 + 20200602 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20200530 + cpe:/o:opensuse:opensuse:20200602 openSUSE diff --git a/weakremovers.inc b/weakremovers.inc index 5196ad5..515ed8b 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -75,7 +75,9 @@ Provides: weakremover(chrony-pool-suse) Provides: weakremover(python3-pytest5) Provides: weakremover(tftpboot-installation-openSUSE-Leap-15.1-x86_64) %ifarch x86_64 +Provides: weakremover(libOpenCL1-32bit) Provides: weakremover(libgnutls30-hmac-32bit) +Provides: weakremover(ocl-icd-devel-32bit) Provides: weakremover(pam-extra-32bit) Provides: weakremover(python3-numpy_1_17_3-gnu-hpc) Provides: weakremover(python3-numpy_1_17_3-gnu-hpc-devel) @@ -810,6 +812,7 @@ Provides: weakremover(libusnic_verbs-rdmav2) Provides: weakremover(libvirt-client-32bit) Provides: weakremover(libvmime-0_9_2-2) Provides: weakremover(libwbxml2-0) +Provides: weakremover(openvswitch-dpdk-test) Provides: weakremover(package-lists-openSUSE-images) Provides: weakremover(paraview-plugin-SciberQuestToolKit) Provides: weakremover(pcp-import-sheet2pcp) @@ -8725,7 +8728,6 @@ Provides: weakremover(imb_2019_1-gnu-mvapich2-hpc) Provides: weakremover(imb_2019_1-gnu-openmpi1-hpc) Provides: weakremover(imb_2019_1-gnu-openmpi2-hpc) Provides: weakremover(imb_2019_1-gnu-openmpi3-hpc) -Provides: weakremover(inkscape-extensions-skencil) Provides: weakremover(intel-gpu-tools) Provides: weakremover(intero) Provides: weakremover(iozone) @@ -10807,6 +10809,7 @@ Provides: weakremover(libnetcdf_4_7_1-gnu-openmpi2-hpc) Provides: weakremover(libnetcdf_4_7_1-gnu-openmpi3-hpc) Provides: weakremover(libnettle6) Provides: weakremover(libnettle7) +Provides: weakremover(libnfc5) Provides: weakremover(libnfs11) Provides: weakremover(libnfs12) Provides: weakremover(libnfs8) @@ -10895,6 +10898,7 @@ Provides: weakremover(libopenvdb6_1) Provides: weakremover(libopenvdb6_2) Provides: weakremover(libopenvswitch-2_10-0) Provides: weakremover(libopenvswitch-2_11-0) +Provides: weakremover(libopenvswitch-2_12-0) Provides: weakremover(libopenvswitch-2_7-1) Provides: weakremover(libopenvswitch-2_8-0) Provides: weakremover(libopenvswitch-2_9-0) @@ -11172,6 +11176,7 @@ Provides: weakremover(libqwt5) Provides: weakremover(libqwtplot3d0) Provides: weakremover(libqxmpp-qt5-doc) Provides: weakremover(libqxmpp0) +Provides: weakremover(libqxmpp2) Provides: weakremover(libqxt-devel) Provides: weakremover(libqxt1) Provides: weakremover(libqyoto2) @@ -15412,6 +15417,8 @@ Provides: weakremover(python2-openqa_review) Provides: weakremover(python2-openstack.nose_plugin) Provides: weakremover(python2-openstackclient) Provides: weakremover(python2-openstackdocstheme) +Provides: weakremover(python2-openvswitch) +Provides: weakremover(python2-openvswitch-test) Provides: weakremover(python2-openwsman) Provides: weakremover(python2-ordered-namespace) Provides: weakremover(python2-ordered-set) @@ -15440,6 +15447,7 @@ Provides: weakremover(python2-oslotest) Provides: weakremover(python2-osmviz) Provides: weakremover(python2-outcome) Provides: weakremover(python2-ovirt-engine-sdk) +Provides: weakremover(python2-ovs) Provides: weakremover(python2-ovsdbapp) Provides: weakremover(python2-pa-ringbuffer) Provides: weakremover(python2-packaging) @@ -16628,6 +16636,7 @@ Provides: weakremover(python3-pyside-devel) Provides: weakremover(python3-pyside-shiboken) Provides: weakremover(python3-pyside-shiboken-doc) Provides: weakremover(python3-pytest-cache) +Provides: weakremover(python3-pytest-faulthandler) Provides: weakremover(python3-pytest-reqs) Provides: weakremover(python3-pytest-test) Provides: weakremover(python3-pytest3) @@ -21040,6 +21049,13 @@ Provides: weakremover(scalapack_2_0_2-gnu-openmpi2-hpc-test) Provides: weakremover(scalapack_2_0_2-gnu-openmpi3-hpc-module) Provides: weakremover(scalapack_2_0_2-gnu-openmpi3-hpc-test) Provides: weakremover(scantailor-cli) +Provides: weakremover(scilab) +Provides: weakremover(scilab-devel) +Provides: weakremover(scilab-lang) +Provides: weakremover(scilab-modules) +Provides: weakremover(scilab-modules-doc) +Provides: weakremover(scilab-modules-doc-lang) +Provides: weakremover(scilab-tests) Provides: weakremover(scim-bridge-qt4) Provides: weakremover(scim-qt4) Provides: weakremover(scons-test) @@ -21184,6 +21200,8 @@ Provides: weakremover(systemd-bash-completion) Provides: weakremover(taglib-sharp) Provides: weakremover(taglib-sharp-devel) Provides: weakremover(targetcli) +Provides: weakremover(tasque) +Provides: weakremover(tasque-lang) Provides: weakremover(tclplug) Provides: weakremover(tcmu-runner-devel) Provides: weakremover(telepathy-haze) @@ -21436,6 +21454,7 @@ Provides: weakremover(wammu-lang) Provides: weakremover(watchman-python) Provides: weakremover(way-cooler) Provides: weakremover(wdfs) +Provides: weakremover(wdm) Provides: weakremover(weather-wallpaper) Provides: weakremover(weather-wallpaper-lang) Provides: weakremover(webkit-jsc-1) @@ -21633,8 +21652,6 @@ Provides: weakremover(robinhood) Provides: weakremover(robinhood-tests) Provides: weakremover(robinhood-tools) Provides: weakremover(robinhood-webgui) -Provides: weakremover(scilab) -Provides: weakremover(scilab-devel) Provides: weakremover(skelcd-installer-Kubic) Provides: weakremover(skelcd-installer-net-Kubic) Provides: weakremover(slurm) @@ -22496,6 +22513,7 @@ Provides: weakremover(libqt5-qtwebview-devel-32bit) Provides: weakremover(libquadmath0-gcc6-32bit) Provides: weakremover(libquadmath0-gcc8-32bit) Provides: weakremover(libqxmpp0-32bit) +Provides: weakremover(libqxmpp2-32bit) Provides: weakremover(librados3) Provides: weakremover(libradospp1) Provides: weakremover(libre2-0-32bit) @@ -22505,6 +22523,7 @@ Provides: weakremover(libsamba-policy0-32bit) Provides: weakremover(libsapi0-32bit) Provides: weakremover(libscalapack2-openmpi-32bit) Provides: weakremover(libscalapack2-openmpi-devel-32bit) +Provides: weakremover(libscilab6) Provides: weakremover(libsfml2-2_4-32bit) Provides: weakremover(libshiboken-1_2_cpython-36m-x86_64-linux-gnu1_2) Provides: weakremover(libsidplay1-32bit)