diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index ac5fc254..6b0fce24 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 20190730) +# spec file for package openSUSE-Addon-NonOss-release (Version 20190731) # # Copyright (c) 2019 openSUSE. # @@ -16,16 +16,16 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon -Version: 20190730 +Version: 20190731 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20190730-0 +Provides: product(openSUSE-Addon-NonOss) = 20190731-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190730 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190731 AutoReqProv: on @@ -49,10 +49,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20190730 + 20190731 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20190730 + cpe:/o:opensuse:opensuse-addon-nonoss:20190731 diff --git a/openSUSE-MicroOS-release.spec b/openSUSE-MicroOS-release.spec index a521c492..e3a5d89b 100644 --- a/openSUSE-MicroOS-release.spec +++ b/openSUSE-MicroOS-release.spec @@ -17,7 +17,7 @@ Name: openSUSE-MicroOS-release -Version: 20190730 +Version: 20190731 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -36,13 +36,16 @@ Provides: distribution-release # MicroOS-release replaces Tumbleweed-Kubic-release Provides: openSUSE-Tumbleweed-Kubic-release Obsoletes: openSUSE-Tumbleweed-Kubic-release <= 20190324 +# 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 Provides: %name-%version Provides: product() = openSUSE-MicroOS -Provides: product(openSUSE-MicroOS) = 20190730-0 +Provides: product(openSUSE-MicroOS) = 20190731-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20190730 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20190731 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) @@ -58,7 +61,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20190730-0 +Provides: product_flavor(openSUSE-MicroOS) = 20190731-0 Summary: openSUSE MicroOS %description dvd @@ -74,7 +77,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(kubic-dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20190730-0 +Provides: product_flavor(openSUSE-MicroOS) = 20190731-0 Summary: openSUSE MicroOS %description kubic-dvd @@ -90,7 +93,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE-MicroOS) = 20190730-0 +Provides: product_flavor(openSUSE-MicroOS) = 20190731-0 Summary: openSUSE MicroOS %description appliance @@ -106,7 +109,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kubic) -Provides: product_flavor(openSUSE-MicroOS) = 20190730-0 +Provides: product_flavor(openSUSE-MicroOS) = 20190731-0 Summary: openSUSE MicroOS %description appliance-kubic @@ -164,11 +167,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-MicroOS.prod << EOF openSUSE openSUSE-MicroOS - 20190730 + 20190731 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-microos:20190730 + cpe:/o:opensuse:opensuse-microos:20190731 openSUSE-MicroOS diff --git a/openSUSE-release.spec b/openSUSE-release.spec index 9b06487f..06cb18ef 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20190730 +Version: 20190731 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}) < 20190730 +Obsoletes: product_flavor(%{product}) < 20190731 # 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) = 20190730-0 +Provides: product(openSUSE) = 20190731-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%3A20190730 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20190731 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) = 20190730-0 +Provides: product_flavor(openSUSE) = 20190731-0 Summary: openSUSE Tumbleweed %description ftp @@ -226,7 +226,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20190730-0 +Provides: product_flavor(openSUSE) = 20190731-0 Summary: openSUSE Tumbleweed %description mini @@ -241,7 +241,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20190730-0 +Provides: product_flavor(openSUSE) = 20190731-0 Summary: openSUSE Tumbleweed %description dvd @@ -256,7 +256,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20190730-0 +Provides: product_flavor(openSUSE) = 20190731-0 Summary: openSUSE Tumbleweed %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) = 20190730-0 +Provides: product_flavor(openSUSE) = 20190731-0 Summary: openSUSE Tumbleweed %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) = 20190730-0 +Provides: product_flavor(openSUSE) = 20190731-0 Summary: openSUSE Tumbleweed %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) = 20190730-0 +Provides: product_flavor(openSUSE) = 20190731-0 Summary: openSUSE Tumbleweed %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) = 20190730-0 +Provides: product_flavor(openSUSE) = 20190731-0 Summary: openSUSE Tumbleweed %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) = 20190730-0 +Provides: product_flavor(openSUSE) = 20190731-0 Summary: openSUSE Tumbleweed %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) = 20190730-0 +Provides: product_flavor(openSUSE) = 20190731-0 Summary: openSUSE Tumbleweed %description usb-x11 @@ -361,7 +361,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20190730-0 +Provides: product_flavor(openSUSE) = 20190731-0 Summary: openSUSE Tumbleweed %description appliance @@ -435,10 +435,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF openSUSE openSUSE - 20190730 + 20190731 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20190730 + cpe:/o:opensuse:opensuse:20190731 openSUSE diff --git a/weakremovers.inc b/weakremovers.inc index bd475557..c281aa26 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -4843,6 +4843,8 @@ Provides: weakremover(xulrunner) Provides: weakremover(xulrunner-devel) Provides: weakremover(yast2-boot-server-devel-doc) Provides: weakremover(yast2-bootloader-devel-doc) +Provides: weakremover(yast2-sysconfig-devel-doc) +Provides: weakremover(yast2-tune-devel-doc) %ifarch x86_64 Provides: weakremover(at-spi-32bit) Provides: weakremover(bbswitch-kmp-pv) @@ -7944,6 +7946,7 @@ Provides: weakremover(Qross-devel) Provides: weakremover(Reaction) Provides: weakremover(Reaction-data) Provides: weakremover(SoQt) +Provides: weakremover(SuSEfirewall2) Provides: weakremover(THE) Provides: weakremover(THE-doc) Provides: weakremover(YampaSynth) @@ -13555,6 +13558,7 @@ Provides: weakremover(libcrypto41) Provides: weakremover(libcrypto42) Provides: weakremover(libcrypto44) Provides: weakremover(libcryptopp5_6_5) +Provides: weakremover(libcryptopp7_0_0) Provides: weakremover(libcryptsetup4) Provides: weakremover(libcryptsetup4-hmac) Provides: weakremover(libcsparse-3_1_9) @@ -13581,6 +13585,7 @@ Provides: weakremover(libdmmp0_1_0) Provides: weakremover(libdnf1) Provides: weakremover(libdns165) Provides: weakremover(libdouble-conversion1) +Provides: weakremover(libdouble-conversion2) Provides: weakremover(libdpdk-17_08-0) Provides: weakremover(libdpdk-17_11-0) Provides: weakremover(libdpdk-18_02) @@ -14077,6 +14082,7 @@ Provides: weakremover(libnetcdf_4_4_1_1-gnu-openmpi1-hpc) Provides: weakremover(libnetcdf_4_4_1_1-gnu-openmpi2-hpc) Provides: weakremover(libnetcdf_4_4_1_1-gnu-openmpi3-hpc) Provides: weakremover(libnfs11) +Provides: weakremover(libnfs12) Provides: weakremover(libnfs8) Provides: weakremover(libnftnl4) Provides: weakremover(libnftnl7) @@ -14428,6 +14434,7 @@ Provides: weakremover(libtomahawk-widgets0_8_99) Provides: weakremover(libtomahawk0_8_4) Provides: weakremover(libtomahawk0_8_99) Provides: weakremover(libtomcrypt0) +Provides: weakremover(libtorrent19) Provides: weakremover(libtracker-control-1_0-0) Provides: weakremover(libtracker-miner-1_0-0) Provides: weakremover(libtracker-sparql-1_0-0) @@ -15873,7 +15880,7 @@ Provides: weakremover(python2-Chameleon-doc) Provides: weakremover(python2-CherryPy) Provides: weakremover(python2-Epsilon) Provides: weakremover(python2-HTTPolice) -Provides: weakremover(python2-Pydap) +Provides: weakremover(python2-PyMuPDF) Provides: weakremover(python2-Pylons) Provides: weakremover(python2-SoapySDR) Provides: weakremover(python2-Sphinx-doc) @@ -15917,6 +15924,7 @@ Provides: weakremover(python2-holoviews) Provides: weakremover(python2-humanfriendly-test) Provides: weakremover(python2-hypothesis-test) Provides: weakremover(python2-imbox) +Provides: weakremover(python2-ipyvolume) Provides: weakremover(python2-ipywebrtc) Provides: weakremover(python2-irc) Provides: weakremover(python2-jellyfish) @@ -16005,7 +16013,6 @@ Provides: weakremover(python3-CXX) Provides: weakremover(python3-CXX-devel) Provides: weakremover(python3-Chameleon-doc) Provides: weakremover(python3-CommonMark-doc) -Provides: weakremover(python3-Pydap) Provides: weakremover(python3-Sphinx-doc) Provides: weakremover(python3-Sphinx-doc-man) Provides: weakremover(python3-Sphinx-test) @@ -16158,6 +16165,7 @@ Provides: weakremover(resolve-trivial-conflicts) Provides: weakremover(rfcat) Provides: weakremover(rfcat-udev) Provides: weakremover(rstudio) +Provides: weakremover(rtorrent-vim) Provides: weakremover(ruby-camgm) Provides: weakremover(ruby-qt4) Provides: weakremover(ruby-qt4-devel) @@ -20416,6 +20424,7 @@ Provides: weakremover(soapysdr0.6-module-rtlsdr) Provides: weakremover(soapysdr0.6-module-uhd) Provides: weakremover(soapysdr0.6-module-xtrx) Provides: weakremover(sparkleshare) +Provides: weakremover(sparse-devel) Provides: weakremover(springlobby) Provides: weakremover(spyder-doc) Provides: weakremover(spyder3-doc) @@ -21022,6 +21031,7 @@ Provides: weakremover(libcrypto41-32bit) Provides: weakremover(libcrypto42-32bit) Provides: weakremover(libcrypto44-32bit) Provides: weakremover(libcryptopp5_6_5-32bit) +Provides: weakremover(libcryptopp7_0_0-32bit) Provides: weakremover(libcryptsetup4-32bit) Provides: weakremover(libcryptsetup4-hmac-32bit) Provides: weakremover(libcupscgi1-32bit) @@ -21033,6 +21043,7 @@ Provides: weakremover(libdbus-1-qt3-0-32bit) Provides: weakremover(libdm0-32bit) Provides: weakremover(libdns165-32bit) Provides: weakremover(libdouble-conversion1-32bit) +Provides: weakremover(libdouble-conversion2-32bit) Provides: weakremover(libechonest2_3-32bit) Provides: weakremover(libedata-cal-1_2-28-32bit) Provides: weakremover(libedataserver-1_2-22-32bit)