From 973cb1dad92403ee0feed5fe29a7886f5f08542a22f142809fe6be17a45d7271 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Fri, 24 Aug 2018 15:13:39 +0000
Subject: [PATCH] Update version

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000product?expand=0&rev=462
---
 ...USE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi |  1 -
 ...er:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi |  1 -
 ...er:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi |  8 +++-----
 ..._converter:openSUSE-Tumbleweed-Kubic-release.spec | 12 ++++++------
 ...ice:product_converter:openSUSE-dvd5-dvd-i586.kiwi |  2 --
 ...e:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi |  2 --
 ...oduct_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi |  2 --
 openSUSE-Tumbleweed-Kubic.product                    |  2 +-
 8 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi b/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
index f46c7141..d8be2698 100644
--- a/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
+++ b/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
@@ -567,7 +567,6 @@
       <repopackage name="yast2-trans-my" onlyarch="skipit"/>
       <repopackage name="yast2-trans-tk" onlyarch="skipit"/>
       <repopackage name="yast2-wagon-control-SLE" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Addon-NonOss-release" addarch="i586,x86_64"/>
     </repopackages>
   </instsource>
 </image>
diff --git a/_service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi b/_service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
index 3c91de3b..ba6e75fa 100644
--- a/_service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
+++ b/_service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
@@ -486,7 +486,6 @@
       <repopackage name="yast2-trans-my" onlyarch="skipit"/>
       <repopackage name="yast2-trans-tk" onlyarch="skipit"/>
       <repopackage name="yast2-wagon-control-SLE" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Addon-NonOss-release" addarch="i586,x86_64"/>
     </repopackages>
   </instsource>
 </image>
diff --git a/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
index 2a15d340..42e4908d 100644
--- a/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Tumbleweed-Kubic___20180822" schemaversion="4.1">
+<image name="OBS__openSUSE-Tumbleweed-Kubic___20180824" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,9 +35,9 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20180822</productvar>
+      <productvar name="VERSION">20180824</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180822,openSUSE Tumbleweed Kubic</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180824,openSUSE Tumbleweed Kubic</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
@@ -715,8 +715,6 @@
       <repopackage name="xz"/>
       <repopackage name="xz"/>
       <repopackage name="zypper"/>
-      <repopackage name="openSUSE-Tumbleweed-Kubic-release" addarch="x86_64"/>
-      <repopackage name="openSUSE-Tumbleweed-Kubic-release-dvd" addarch="x86_64"/>
     </repopackages>
   </instsource>
 </image>
diff --git a/_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec b/_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec
index c17afe62..718a9709 100644
--- a/_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec
+++ b/_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec
@@ -17,7 +17,7 @@
 
 
 Name:           openSUSE-Tumbleweed-Kubic-release
-Version:        20180822
+Version:        20180824
 Release:        0
 Summary:        openSUSE Tumbleweed Kubic 
 License:        GPL-2.0-or-later
@@ -38,9 +38,9 @@ Provides:       openSUSE-Kubic-release
 ExclusiveArch:  %ix86 x86_64 ppc64le s390x aarch64
 Provides:       %name-%version
 Provides:       product() = openSUSE-Tumbleweed-Kubic
-Provides:       product(openSUSE-Tumbleweed-Kubic) = 20180822-0
+Provides:       product(openSUSE-Tumbleweed-Kubic) = 20180824-0
 Provides:       product-label() = openSUSE%20Tumbleweed%20Kubic
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20180822
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20180824
 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-Tumbleweed-Kubic)
@@ -61,7 +61,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
-Provides:       product_flavor(openSUSE-Tumbleweed-Kubic) = 20180822-0
+Provides:       product_flavor(openSUSE-Tumbleweed-Kubic) = 20180824-0
 Summary:        openSUSE Tumbleweed Kubic
 
 %description dvd
@@ -123,11 +123,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Tumbleweed-Kubic.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>openSUSE-Tumbleweed-Kubic</name>
-  <version>20180822</version>
+  <version>20180824</version>
   <release>0</release>
   <endoflife></endoflife>
   <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180822</cpeid>
+  <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180824</cpeid>
   <productline>openSUSE-Tumbleweed-Kubic</productline>
   <register>
     <pool>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index b3cd477d..f0bc2ac2 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -5410,8 +5410,6 @@
       <repopackage name="zypper-aptitude" arch="i586,i686"/>
       <repopackage name="zypper-lifecycle-plugin" arch="i586,i686"/>
       <repopackage name="zypper-log" arch="i586,i686"/>
-      <repopackage name="openSUSE-release" addarch="i586"/>
-      <repopackage name="openSUSE-release-dvd" addarch="i586"/>
     </repopackages>
   </instsource>
 </image>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
index b8555867..425ddfc5 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -5571,8 +5571,6 @@
       <repopackage name="zypper-aptitude" arch="x86_64"/>
       <repopackage name="zypper-lifecycle-plugin" arch="x86_64"/>
       <repopackage name="zypper-log" arch="x86_64"/>
-      <repopackage name="openSUSE-release" addarch="x86_64"/>
-      <repopackage name="openSUSE-release-dvd" addarch="x86_64"/>
     </repopackages>
   </instsource>
 </image>
diff --git a/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi b/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi
index 7659a618..d6b7e6e4 100644
--- a/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi
+++ b/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi
@@ -465,8 +465,6 @@
       <repopackage name="yast2-trans-my" onlyarch="skipit"/>
       <repopackage name="yast2-trans-tk" onlyarch="skipit"/>
       <repopackage name="yast2-wagon-control-SLE" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release" addarch="i586,x86_64"/>
-      <repopackage name="openSUSE-release-ftp" addarch="i586,x86_64"/>
     </repopackages>
   </instsource>
 </image>
diff --git a/openSUSE-Tumbleweed-Kubic.product b/openSUSE-Tumbleweed-Kubic.product
index 63165bae..bfa35b5e 100644
--- a/openSUSE-Tumbleweed-Kubic.product
+++ b/openSUSE-Tumbleweed-Kubic.product
@@ -6,7 +6,7 @@
       <name>openSUSE-Tumbleweed-Kubic</name>
       <releasepkgname>openSUSE-Tumbleweed-Kubic-release</releasepkgname>
       <endoflife/>
-      <version>20180822</version>
+      <version>20180824</version>
       <!-- release is no longer optional -->
       <release>0</release>
       <productline>openSUSE-Tumbleweed-Kubic</productline>