1
0
Staging Bot 2019-04-21 10:56:38 +00:00 committed by Git OBS Bridge
parent 80a077caf3
commit 5ab61ea73b
4 changed files with 54 additions and 30 deletions

View File

@ -1,5 +1,5 @@
#
# spec file for package openSUSE-Addon-NonOss-release (Version 20190420)
# spec file for package openSUSE-Addon-NonOss-release (Version 20190421)
#
# Copyright (c) 2019 openSUSE.
#
@ -16,16 +16,16 @@
Name: openSUSE-Addon-NonOss-release
%define product openSUSE-Addon-NonOss
Summary: openSUSE NonOSS Addon
Version: 20190420
Version: 20190421
Release: 0
License: BSD-3-Clause
Group: System/Fhs
Provides: %name-%version
Provides: product() = openSUSE-Addon-NonOss
Provides: product(openSUSE-Addon-NonOss) = 20190420-0
Provides: product(openSUSE-Addon-NonOss) = 20190421-0
Provides: product-label() = non%20oss%20addon
Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190420
Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190421
AutoReqProv: on
@ -49,10 +49,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE-Addon-NonOss</name>
<version>20190420</version>
<version>20190421</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
<cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20190420</cpeid>
<cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20190421</cpeid>
<register>
<pool>
</pool>

View File

@ -17,7 +17,7 @@
Name: openSUSE-MicroOS-release
Version: 20190420
Version: 20190421
Release: 0
Summary: openSUSE MicroOS
License: GPL-2.0-or-later
@ -40,9 +40,9 @@ Obsoletes: openSUSE-Tumbleweed-Kubic-release <= 20190324
ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64
Provides: %name-%version
Provides: product() = openSUSE-MicroOS
Provides: product(openSUSE-MicroOS) = 20190420-0
Provides: product(openSUSE-MicroOS) = 20190421-0
Provides: product-label() = openSUSE%20MicroOS
Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20190420
Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20190421
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 +58,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
Provides: product_flavor(openSUSE-MicroOS) = 20190420-0
Provides: product_flavor(openSUSE-MicroOS) = 20190421-0
Summary: openSUSE MicroOS
%description dvd
@ -74,7 +74,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(kubic-dvd)
Provides: product_flavor(openSUSE-MicroOS) = 20190420-0
Provides: product_flavor(openSUSE-MicroOS) = 20190421-0
Summary: openSUSE MicroOS
%description kubic-dvd
@ -132,11 +132,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-MicroOS.prod << EOF
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE-MicroOS</name>
<version>20190420</version>
<version>20190421</version>
<release>0</release>
<endoflife></endoflife>
<arch>%{_target_cpu}</arch>
<cpeid>cpe:/o:opensuse:opensuse-microos:20190420</cpeid>
<cpeid>cpe:/o:opensuse:opensuse-microos:20190421</cpeid>
<productline>openSUSE-MicroOS</productline>
<register>
<pool>
@ -186,6 +186,19 @@ EOF
%post
# Update from openSUSE-Tumbleweed-Kubic to openSUSE-MicroOS
# Fix the baseproduct symlink and make sure, it exists
if [ -L /etc/products.d/baseproduct ] ; then
PRODLINK=$(basename $(readlink -f /etc/products.d/baseproduct))
if [ "$PRODLINK" == "openSUSE-Tumbleweed-Kubic.prod" ]; then
rm -f /etc/products.d/baseproduct
fi
fi
if [ ! -e /etc/products.d/baseproduct ]; then
ln -sf openSUSE-MicroOS.prod /etc/products.d/baseproduct
fi
%files
%defattr(644,root,root,755)
%{_sysconfdir}/os-release

View File

@ -20,7 +20,7 @@
#define betaversion %{nil}
%define codename Tumbleweed
Name: openSUSE-release
Version: 20190420
Version: 20190421
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}) < 20190420
Obsoletes: product_flavor(%{product}) < 20190421
# 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) = 20190420-0
Provides: product(openSUSE) = 20190421-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%3A20190420
Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20190421
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) = 20190420-0
Provides: product_flavor(openSUSE) = 20190421-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) = 20190420-0
Provides: product_flavor(openSUSE) = 20190421-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) = 20190420-0
Provides: product_flavor(openSUSE) = 20190421-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) = 20190420-0
Provides: product_flavor(openSUSE) = 20190421-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) = 20190420-0
Provides: product_flavor(openSUSE) = 20190421-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) = 20190420-0
Provides: product_flavor(openSUSE) = 20190421-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) = 20190420-0
Provides: product_flavor(openSUSE) = 20190421-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) = 20190420-0
Provides: product_flavor(openSUSE) = 20190421-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) = 20190420-0
Provides: product_flavor(openSUSE) = 20190421-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) = 20190420-0
Provides: product_flavor(openSUSE) = 20190421-0
Summary: openSUSE Tumbleweed
%description usb-x11
@ -420,10 +420,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE</name>
<version>20190420</version>
<version>20190421</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
<cpeid>cpe:/o:opensuse:opensuse:20190420</cpeid>
<cpeid>cpe:/o:opensuse:opensuse:20190421</cpeid>
<productline>openSUSE</productline>
<register>
<pool>

View File

@ -13862,6 +13862,8 @@ Provides: weakremover(libkolab-qt5-devel)
Provides: weakremover(libkolab1)
Provides: weakremover(libkpmcore5)
Provides: weakremover(libkpmcore6)
Provides: weakremover(libkqoauth-devel)
Provides: weakremover(libkqoauth0)
Provides: weakremover(libkscreen)
Provides: weakremover(libkscreen-devel)
Provides: weakremover(libkscreen1)
@ -14166,6 +14168,8 @@ Provides: weakremover(libquadmath0-gcc8)
Provides: weakremover(libquazip1)
Provides: weakremover(libquo4)
Provides: weakremover(libqutim0)
Provides: weakremover(libqxt-devel)
Provides: weakremover(libqxt1)
Provides: weakremover(libqyoto2)
Provides: weakremover(libratbag4)
Provides: weakremover(libraven0)
@ -14640,16 +14644,22 @@ Provides: weakremover(libykneomgr-doc)
Provides: weakremover(libykneomgr0)
Provides: weakremover(libyui-ncurses-pkg7)
Provides: weakremover(libyui-ncurses-pkg8)
Provides: weakremover(libyui-ncurses-pkg9)
Provides: weakremover(libyui-ncurses7)
Provides: weakremover(libyui-ncurses8)
Provides: weakremover(libyui-ncurses9)
Provides: weakremover(libyui-qt-graph7)
Provides: weakremover(libyui-qt-graph8)
Provides: weakremover(libyui-qt-graph9)
Provides: weakremover(libyui-qt-pkg7)
Provides: weakremover(libyui-qt-pkg8)
Provides: weakremover(libyui-qt-pkg9)
Provides: weakremover(libyui-qt7)
Provides: weakremover(libyui-qt8)
Provides: weakremover(libyui-qt9)
Provides: weakremover(libyui7)
Provides: weakremover(libyui8)
Provides: weakremover(libyui9)
Provides: weakremover(libz3-4_5)
Provides: weakremover(libz3-4_6)
Provides: weakremover(libzbargtk-devel)
@ -15324,6 +15334,7 @@ Provides: weakremover(php7-imap)
Provides: weakremover(php7-testresults)
Provides: weakremover(pidgin-plugin-embeddedvideo)
Provides: weakremover(pidgin-plugin-openfetion)
Provides: weakremover(pk-update-icon-lang)
Provides: weakremover(planner)
Provides: weakremover(planner-devel)
Provides: weakremover(planner-lang)
@ -15413,7 +15424,6 @@ Provides: weakremover(python-clang)
Provides: weakremover(python-cliff-tablib)
Provides: weakremover(python-cloudfiles)
Provides: weakremover(python-cly)
Provides: weakremover(python-cmd2)
Provides: weakremover(python-configparser2)
Provides: weakremover(python-configshell)
Provides: weakremover(python-configshell-doc)
@ -20735,6 +20745,7 @@ Provides: weakremover(libjson-c2-32bit)
Provides: weakremover(libjson-c3-32bit)
Provides: weakremover(libkdecorations2private5-32bit)
Provides: weakremover(libkdepimlibs4-32bit)
Provides: weakremover(libkqoauth0-32bit)
Provides: weakremover(liblash1-32bit)
Provides: weakremover(liblcms-devel-32bit)
Provides: weakremover(liblcms1-32bit)