Dominique Leuenberger 2018-04-02 20:50:04 +00:00 committed by Git OBS Bridge
parent 42cb36ac33
commit de382511d7
7 changed files with 32 additions and 32 deletions

View File

@ -1,4 +1,4 @@
<image name="OBS__openSUSE___20180401" schemaversion="4.1"> <image name="OBS__openSUSE___20180402" schemaversion="4.1">
<description type="system"> <description type="system">
<author>The SUSE Team</author> <author>The SUSE Team</author>
<contact>build@opensuse.org</contact> <contact>build@opensuse.org</contact>
@ -32,9 +32,9 @@
<productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar> <productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar> <productvar name="VENDOR">openSUSE</productvar>
<productvar name="VERSION">20180401</productvar> <productvar name="VERSION">20180402</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo> <productinfo name="CONTENTSTYLE">11</productinfo>
<productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180401,openSUSE Tumbleweed</productinfo> <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180402,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
<productinfo name="VENDOR">openSUSE</productinfo> <productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>

View File

@ -1,4 +1,4 @@
<image name="OBS__openSUSE___20180401" schemaversion="4.1"> <image name="OBS__openSUSE___20180402" schemaversion="4.1">
<description type="system"> <description type="system">
<author>The SUSE Team</author> <author>The SUSE Team</author>
<contact>build@opensuse.org</contact> <contact>build@opensuse.org</contact>
@ -35,9 +35,9 @@
<productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar> <productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar> <productvar name="VENDOR">openSUSE</productvar>
<productvar name="VERSION">20180401</productvar> <productvar name="VERSION">20180402</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo> <productinfo name="CONTENTSTYLE">11</productinfo>
<productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180401,openSUSE Tumbleweed</productinfo> <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180402,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
<productinfo name="VENDOR">openSUSE</productinfo> <productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>

View File

@ -1,4 +1,4 @@
<image name="OBS__openSUSE___20180401" schemaversion="4.1"> <image name="OBS__openSUSE___20180402" schemaversion="4.1">
<description type="system"> <description type="system">
<author>The SUSE Team</author> <author>The SUSE Team</author>
<contact>build@opensuse.org</contact> <contact>build@opensuse.org</contact>
@ -32,9 +32,9 @@
<productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar> <productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar> <productvar name="VENDOR">openSUSE</productvar>
<productvar name="VERSION">20180401</productvar> <productvar name="VERSION">20180402</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo> <productinfo name="CONTENTSTYLE">11</productinfo>
<productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180401,openSUSE Tumbleweed</productinfo> <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180402,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
<productinfo name="VENDOR">openSUSE</productinfo> <productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>

View File

@ -1,4 +1,4 @@
<image name="OBS__openSUSE___20180401" schemaversion="4.1"> <image name="OBS__openSUSE___20180402" schemaversion="4.1">
<description type="system"> <description type="system">
<author>The SUSE Team</author> <author>The SUSE Team</author>
<contact>build@opensuse.org</contact> <contact>build@opensuse.org</contact>
@ -35,9 +35,9 @@
<productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar> <productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar> <productvar name="VENDOR">openSUSE</productvar>
<productvar name="VERSION">20180401</productvar> <productvar name="VERSION">20180402</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo> <productinfo name="CONTENTSTYLE">11</productinfo>
<productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180401,openSUSE Tumbleweed</productinfo> <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180402,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
<productinfo name="VENDOR">openSUSE</productinfo> <productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>

View File

@ -1,4 +1,4 @@
<image name="OBS__openSUSE___20180401" schemaversion="4.1"> <image name="OBS__openSUSE___20180402" schemaversion="4.1">
<description type="system"> <description type="system">
<author>The SUSE Team</author> <author>The SUSE Team</author>
<contact>build@opensuse.org</contact> <contact>build@opensuse.org</contact>
@ -24,7 +24,7 @@
<productvar name="DISTNAME">openSUSE</productvar> <productvar name="DISTNAME">openSUSE</productvar>
<productvar name="FLAVOR">ftp</productvar> <productvar name="FLAVOR">ftp</productvar>
<productvar name="MAKE_LISTINGS">true</productvar> <productvar name="MAKE_LISTINGS">true</productvar>
<productvar name="MEDIUM_NAME">openSUSE-20180401-i586-x86_64</productvar> <productvar name="MEDIUM_NAME">openSUSE-20180402-i586-x86_64</productvar>
<productvar name="MULTIPLE_MEDIA">true</productvar> <productvar name="MULTIPLE_MEDIA">true</productvar>
<productvar name="PRODUCT_DIR">/</productvar> <productvar name="PRODUCT_DIR">/</productvar>
<productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar> <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@ -36,9 +36,9 @@
<productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar> <productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar> <productvar name="VENDOR">openSUSE</productvar>
<productvar name="VERSION">20180401</productvar> <productvar name="VERSION">20180402</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo> <productinfo name="CONTENTSTYLE">11</productinfo>
<productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180401,openSUSE Tumbleweed</productinfo> <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180402,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
<productinfo name="VENDOR">openSUSE</productinfo> <productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="DEBUGMEDIUM">2</productoption> <productoption name="DEBUGMEDIUM">2</productoption>

View File

@ -20,7 +20,7 @@
#define betaversion %{nil} #define betaversion %{nil}
%define codename Tumbleweed %define codename Tumbleweed
Name: openSUSE-release Name: openSUSE-release
Version: 20180401 Version: 20180402
Release: 0 Release: 0
# 0 is the product release, not the build release of this package # 0 is the product release, not the build release of this package
Summary: openSUSE Tumbleweed Summary: openSUSE Tumbleweed
@ -51,7 +51,7 @@ Provides: product-update() = dup
Obsoletes: aaa_version Obsoletes: aaa_version
Obsoletes: openSUSE-Promo-release <= 11.1 Obsoletes: openSUSE-Promo-release <= 11.1
Obsoletes: openSUSE-release-live <= 11.0 Obsoletes: openSUSE-release-live <= 11.0
Obsoletes: product_flavor(%{product}) < 20180401 Obsoletes: product_flavor(%{product}) < 20180402
# bnc#826592 # bnc#826592
Provides: weakremover(kernel-default) < 3.11 Provides: weakremover(kernel-default) < 3.11
Provides: weakremover(kernel-desktop) < 4.2 Provides: weakremover(kernel-desktop) < 4.2
@ -61,7 +61,7 @@ Provides: weakremover(kernel-vanilla) < 3.11
Provides: weakremover(kernel-xen) < 3.11 Provides: weakremover(kernel-xen) < 3.11
Provides: %name-%version Provides: %name-%version
Provides: product() = openSUSE Provides: product() = openSUSE
Provides: product(openSUSE) = 20180401-0 Provides: product(openSUSE) = 20180402-0
%ifarch x86_64 %ifarch x86_64
Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
%endif %endif
@ -75,7 +75,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Dppc64le
Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64
%endif %endif
Provides: product-label() = openSUSE Provides: product-label() = openSUSE
Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20180401 Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20180402
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm 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 Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
Requires: product_flavor(openSUSE) Requires: product_flavor(openSUSE)
@ -12861,7 +12861,7 @@ License: BSD-3-Clause
Group: System/Fhs Group: System/Fhs
Provides: product_flavor() Provides: product_flavor()
Provides: flavor(ftp) Provides: flavor(ftp)
Provides: product_flavor(openSUSE) = 20180401-0 Provides: product_flavor(openSUSE) = 20180402-0
Summary: openSUSE Tumbleweed Summary: openSUSE Tumbleweed
%description ftp %description ftp
@ -12876,7 +12876,7 @@ License: BSD-3-Clause
Group: System/Fhs Group: System/Fhs
Provides: product_flavor() Provides: product_flavor()
Provides: flavor(mini) Provides: flavor(mini)
Provides: product_flavor(openSUSE) = 20180401-0 Provides: product_flavor(openSUSE) = 20180402-0
Summary: openSUSE Tumbleweed Summary: openSUSE Tumbleweed
%description mini %description mini
@ -12891,7 +12891,7 @@ License: BSD-3-Clause
Group: System/Fhs Group: System/Fhs
Provides: product_flavor() Provides: product_flavor()
Provides: flavor(dvd) Provides: flavor(dvd)
Provides: product_flavor(openSUSE) = 20180401-0 Provides: product_flavor(openSUSE) = 20180402-0
Summary: openSUSE Tumbleweed Summary: openSUSE Tumbleweed
%description dvd %description dvd
@ -12906,7 +12906,7 @@ License: BSD-3-Clause
Group: System/Fhs Group: System/Fhs
Provides: product_flavor() Provides: product_flavor()
Provides: flavor(livecd-kde) Provides: flavor(livecd-kde)
Provides: product_flavor(openSUSE) = 20180401-0 Provides: product_flavor(openSUSE) = 20180402-0
Summary: openSUSE Tumbleweed Summary: openSUSE Tumbleweed
%description livecd-kde %description livecd-kde
@ -12921,7 +12921,7 @@ License: BSD-3-Clause
Group: System/Fhs Group: System/Fhs
Provides: product_flavor() Provides: product_flavor()
Provides: flavor(livecd-x11) Provides: flavor(livecd-x11)
Provides: product_flavor(openSUSE) = 20180401-0 Provides: product_flavor(openSUSE) = 20180402-0
Summary: openSUSE Tumbleweed Summary: openSUSE Tumbleweed
%description livecd-x11 %description livecd-x11
@ -12936,7 +12936,7 @@ License: BSD-3-Clause
Group: System/Fhs Group: System/Fhs
Provides: product_flavor() Provides: product_flavor()
Provides: flavor(livecd-gnome) Provides: flavor(livecd-gnome)
Provides: product_flavor(openSUSE) = 20180401-0 Provides: product_flavor(openSUSE) = 20180402-0
Summary: openSUSE Tumbleweed Summary: openSUSE Tumbleweed
%description livecd-gnome %description livecd-gnome
@ -12951,7 +12951,7 @@ License: BSD-3-Clause
Group: System/Fhs Group: System/Fhs
Provides: product_flavor() Provides: product_flavor()
Provides: flavor(usb-kde) Provides: flavor(usb-kde)
Provides: product_flavor(openSUSE) = 20180401-0 Provides: product_flavor(openSUSE) = 20180402-0
Summary: openSUSE Tumbleweed Summary: openSUSE Tumbleweed
%description usb-kde %description usb-kde
@ -12966,7 +12966,7 @@ License: BSD-3-Clause
Group: System/Fhs Group: System/Fhs
Provides: product_flavor() Provides: product_flavor()
Provides: flavor(usb-gnome) Provides: flavor(usb-gnome)
Provides: product_flavor(openSUSE) = 20180401-0 Provides: product_flavor(openSUSE) = 20180402-0
Summary: openSUSE Tumbleweed Summary: openSUSE Tumbleweed
%description usb-gnome %description usb-gnome
@ -12981,7 +12981,7 @@ License: BSD-3-Clause
Group: System/Fhs Group: System/Fhs
Provides: product_flavor() Provides: product_flavor()
Provides: flavor(usb-x11) Provides: flavor(usb-x11)
Provides: product_flavor(openSUSE) = 20180401-0 Provides: product_flavor(openSUSE) = 20180402-0
Summary: openSUSE Tumbleweed Summary: openSUSE Tumbleweed
%description usb-x11 %description usb-x11
@ -13054,10 +13054,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
<product schemeversion="0"> <product schemeversion="0">
<vendor>openSUSE</vendor> <vendor>openSUSE</vendor>
<name>openSUSE</name> <name>openSUSE</name>
<version>20180401</version> <version>20180402</version>
<release>0</release> <release>0</release>
<arch>%{_target_cpu}</arch> <arch>%{_target_cpu}</arch>
<cpeid>cpe:/o:opensuse:opensuse:20180401</cpeid> <cpeid>cpe:/o:opensuse:opensuse:20180402</cpeid>
<productline>openSUSE</productline> <productline>openSUSE</productline>
<register> <register>
<pool> <pool>

View File

@ -4,7 +4,7 @@
<product> <product>
<vendor>openSUSE</vendor> <vendor>openSUSE</vendor>
<name>openSUSE</name> <name>openSUSE</name>
<version>20180401</version> <version>20180402</version>
<release>0</release> <release>0</release>
<productline>openSUSE</productline> <productline>openSUSE</productline>