Update to Tumbleweed versions

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000release-packages?expand=0&rev=3

_multibuild

@@ -1,4 +1,5 @@
 <multibuild>
   <package>openSUSE-Addon-NonOss-release</package>
+  <package>openSUSE-Tumbleweed-Kubic-release</package>
   <package>openSUSE-release</package>
 </multibuild>

archsets.inc

@@ -0,0 +1,65 @@
+
+    <archsets>
+      <archset name="i586" productarch="i586">
+        <arch>i586</arch>
+        <arch>i686</arch>  <!-- i686 is fallback of i586 because we have some optional packages for i686 only -->
+        <arch>noarch</arch>
+      </archset>
+
+      <archset name="i686" productarch="i686">
+        <arch>i686</arch>
+        <arch>i586</arch>
+        <arch>i486</arch>
+        <arch>i386</arch>
+        <arch>noarch</arch>
+      </archset>
+
+      <archset name="x86_64" productarch="x86_64">
+        <arch>x86_64</arch>
+        <arch>i686</arch>
+        <arch>i586</arch>
+        <arch>i486</arch>
+        <arch>i386</arch>
+        <arch>noarch</arch>
+      </archset>
+
+      <archset name="ppc" productarch="ppc">
+        <arch>ppc</arch>
+        <arch>noarch</arch>
+      </archset>
+
+      <archset name="ppc64" productarch="ppc64">
+        <arch>ppc64</arch>
+        <arch>noarch</arch>
+      </archset>
+
+      <archset name="ppc64le" productarch="ppc64le">
+        <arch>ppc64le</arch>
+        <arch>noarch</arch>
+      </archset>
+
+      <archset name="s390x" productarch="s390x">
+        <arch>s390x</arch>
+        <arch>noarch</arch>
+      </archset>
+
+      <archset name="armv6l" productarch="armv6hl">
+        <arch>armv6hl</arch>
+        <arch>armv6l</arch>
+        <arch>noarch</arch>
+      </archset>
+
+      <archset name="armv7l" productarch="armv7hl">
+        <arch>armv7hl</arch>
+        <arch>armv7l</arch>
+        <arch>noarch</arch>
+      </archset>
+
+      <archset name="aarch64" productarch="aarch64">
+        <arch>aarch64</arch>
+        <arch>noarch</arch>
+      </archset>
+
+
+    </archsets>
+

conditionals.inc

@@ -0,0 +1,52 @@
+
+    <conditionals>
+        <conditional name="baselibs_only_x86_64">
+                <platform onlyarch="x86_64" />
+        </conditional>
+        <conditional name="baselibs_hammer_from_i686">
+                <platform arch="x86_64" baselibs_arch="i686" />
+        </conditional>
+        <conditional name="only_i586">
+                <platform arch="i586,i686" />
+        </conditional>
+        <conditional name="only_i686">
+                <platform arch="i586,i686" onlyarch="i686" />
+        </conditional>
+        <conditional name="only_x86_64">
+                <platform arch="x86_64" />
+        </conditional>
+        <conditional name="only_aarch64">
+                <platform arch="aarch64" />
+        </conditional>
+        <conditional name="only_ppc64">
+                <platform arch="ppc64" />
+        </conditional>
+        <conditional name="only_ppc64le">
+                <platform arch="ppc64le" />
+        </conditional>
+        <conditional name="drop_from_ftp">
+                <platform onlyarch="skipit" />
+        </conditional>
+        <conditional name="drop_from_medium">
+                <platform onlyarch="skipit" />
+        </conditional>
+        <conditional name="i586_special">
+                <platform arch="i586,i686" addarch="i586,i686" />
+        </conditional>
+        <conditional name="i686_special">
+                <platform arch="i586" onlyarch="x86_64,i686" />
+        </conditional>
+        <conditional name="i686_replacement">
+                <platform arch="i586,i686,x86_64" onlyarch="x86_64,i686" />
+        </conditional>
+	<conditional name="baselibs_only_s390x">
+		<platform arch="s390x" onlyarch="s390x"/>
+	</conditional>
+	<conditional name="s390_special">
+		<platform arch="s390x" addarch="s390" />
+	</conditional>
+	<conditional name="only_s390x">
+		<platform arch="s390x" />
+	</conditional>
+    </conditionals>
+

openSUSE-Addon-NonOss-release.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package openSUSE-Addon-NonOss-release (Version 15.1)
+# spec file for package openSUSE-Addon-NonOss-release
 #
-# Copyright (c) 2018 openSUSE.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,23 +12,24 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
 
 Name:           openSUSE-Addon-NonOss-release
 %define         product openSUSE-Addon-NonOss
-Summary:        openSUSE Leap 15.1 NonOSS Addon
+Summary:        openSUSE NonOSS Addon
-Version:        15.1
-Release:        0
 License:        BSD-3-Clause
 Group:          System/Fhs
+Version:        20181203
+Release:        0
 
 Provides:       %name-%version
 Provides:       product() = openSUSE-Addon-NonOss
-Provides:       product(openSUSE-Addon-NonOss) = 15.1-0
+Provides:       product(openSUSE-Addon-NonOss) = 20181203-0
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20181203
 Provides:       product-label() = non%20oss%20addon
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A15.1
 
-
-AutoReqProv:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -41,7 +42,6 @@ non oss repo and cd
 
 %build
 
-
 %install
 mkdir -p $RPM_BUILD_ROOT/etc/products.d
 cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
@@ -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>15.1</version>
+  <version>20181203</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:15.1</cpeid>
+  <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20181203</cpeid>
   <register>
     <pool>
     </pool>
@@ -61,7 +61,7 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
   </register>
   <repositories>
   </repositories>
-  <summary>openSUSE Leap 15.1 NonOSS Addon</summary>
+  <summary>openSUSE NonOSS Addon</summary>
   <shortsummary>non oss addon</shortsummary>
   <description>non oss repo and cd</description>
   <linguas>
@@ -109,15 +109,16 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
     <allowresolving>false</allowresolving>
   </buildconfig>
   <installconfig>
-    <releasepackage name="%{name}" flag="EQ" version="%{version}" release="%{release}"/>
+    <datadir>suse</datadir>
+    <descriptiondir>suse/setup/descr</descriptiondir>
+    <releasepackage name="openSUSE-release" flag="EQ" version="13.1" release="%{release}"/>
+    <distribution>openSUSE-Addon-NonOss</distribution>
   </installconfig>
   <runtimeconfig/>
 </product>
 
 EOF
 
-
-
 %clean
 rm -rf %buildroot
 

openSUSE-Tumbleweed-Kubic-release.spec

@@ -0,0 +1,189 @@
+#
+# spec file for package openSUSE-Tumbleweed-Kubic-release
+#
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+Name:           openSUSE-Tumbleweed-Kubic-release
+Version:        20181120
+Release:        0
+Summary:        openSUSE Tumbleweed Kubic 
+License:        GPL-2.0-or-later
+Group:          System/Fhs
+BuildRequires:  skelcd-openSUSE
+Requires:       issue-generator
+# Make sure we are at SLES12 SP2 level
+PreReq:         glibc >= 2.19
+# in rare cases, 'ln' is not found...
+Requires(post): coreutils
+Recommends:     branding
+Conflicts:      distribution-release
+Conflicts:      kernel < 4.4
+Provides:       distribution-release
+# Needed to not break installation-images in short turn; this needs to fixed there of course
+Provides:       openSUSE-Kubic-release
+# 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-Tumbleweed-Kubic
+Provides:       product(openSUSE-Tumbleweed-Kubic) = 20181120-0
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20181120
+Provides:       product-endoflife()
+Provides:       product-label() = openSUSE%20Tumbleweed%20Kubic
+Provides:       product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
+Requires:       product_flavor(openSUSE-Tumbleweed-Kubic)
+
+%description
+openSUSE Tumbleweed Kubic combines the benefits of a rolling
+      OS with a container orchestration platform.
+
+      It is a modern Linux Operating System, designed for containers and
+      optimized for large, clustered deployments.  It inherits the benefits of
+      openSUSE Tumbleweed while redefining the operating system into a small,
+      efficient and reliable distribution.
+
+%package dvd
+Provides:       flavor(dvd)
+Provides:       product_flavor()
+Provides:       product_flavor(openSUSE-Tumbleweed-Kubic) = 20181120-0
+Summary:        openSUSE Tumbleweed Kubic
+License:        BSD-3-Clause
+Group:          System/Fhs
+
+%description dvd
+openSUSE Tumbleweed Kubic combines the benefits of a rolling
+      OS with a container orchestration platform.
+
+      It is a modern Linux Operating System, designed for containers and
+      optimized for large, clustered deployments.  It inherits the benefits of
+      openSUSE Tumbleweed while redefining the operating system into a small,
+      efficient and reliable distribution.
+
+%files dvd
+%defattr(-,root,root)
+%doc %{_defaultdocdir}/openSUSE-Tumbleweed-Kubic-release-dvd
+
+%prep
+
+%build
+
+%install
+mkdir -p %{buildroot}%{_sysconfdir}
+mkdir -p %{buildroot}%{_libexecdir}/issue.d
+echo -e "\nWelcome to openSUSE Tumbleweed Kubic (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_libexecdir}/issue.d/10-OS
+echo -e "\n" > %{buildroot}%{_libexecdir}/issue.d/90-OS
+
+touch %{buildroot}%{_sysconfdir}/motd
+
+# Put EULA into correct place
+mkdir -p %{buildroot}/%{_sysconfdir}/YaST2/licenses/base
+cd %{buildroot}/%{_sysconfdir}/YaST2/licenses/base
+if [ -f /CD1/license.tar.gz ]; then
+  tar -xzf /CD1/license.tar.gz
+elif [ -f %{_libexecdir}/skelcd/CD1/license.tar.gz ]; then
+  tar -xzf %{_libexecdir}/skelcd/CD1/license.tar.gz
+fi
+
+VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'`
+# note: VERSION is an optional field and has no meaning other than informative on a rolling distro
+# We do thus not add it to the os-release file
+cat > %{buildroot}%{_libexecdir}/os-release <<EOF
+NAME="openSUSE Tumbleweed Kubic"
+# VERSION="%{version}%{?betaversion: %{betaversion}}"
+ID="opensuse-tumbleweed-kubic"
+ID_LIKE="suse opensuse opensuse-tumbleweed"
+VERSION_ID="$VERSION_ID"
+PRETTY_NAME="openSUSE Tumbleweed Kubic"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:opensuse:tumbleweed-kubic:%{version}"
+BUG_REPORT_URL="https://bugs.opensuse.org"
+HOME_URL="https://www.opensuse.org/"
+EOF
+ln -s ..%{_libexecdir}/os-release %{buildroot}%{_sysconfdir}/os-release
+
+mkdir -p $RPM_BUILD_ROOT/etc/products.d
+cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Tumbleweed-Kubic.prod << EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<product schemeversion="0">
+  <vendor>openSUSE</vendor>
+  <name>openSUSE-Tumbleweed-Kubic</name>
+  <version>20181120</version>
+  <release>0</release>
+  <endoflife></endoflife>
+  <arch>%{_target_cpu}</arch>
+  <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20181120</cpeid>
+  <productline>openSUSE-Tumbleweed-Kubic</productline>
+  <register>
+    <pool>
+    </pool>
+    <updates>
+    </updates>
+  </register>
+  <repositories>
+  </repositories>
+  <summary>openSUSE Tumbleweed Kubic</summary>
+  <shortsummary>openSUSE Tumbleweed Kubic</shortsummary>
+  <description>openSUSE Tumbleweed Kubic combines the benefits of a rolling
+      OS with a container orchestration platform.
+
+      It is a modern Linux Operating System, designed for containers and
+      optimized for large, clustered deployments.  It inherits the benefits of
+      openSUSE Tumbleweed while redefining the operating system into a small,
+      efficient and reliable distribution.</description>
+  <linguas>
+    <language>en_US</language>
+  </linguas>
+  <urls>
+    <url name="releasenotes">http://doc.opensuse.org/release-notes/x86_64/openSUSE/Tumbleweed/release-notes-openSUSE.rpm</url>
+  </urls>
+  <buildconfig>
+    <producttheme>Kubic</producttheme>
+    <create_flavors>true</create_flavors>
+  </buildconfig>
+  <installconfig>
+    <defaultlang>en_US</defaultlang>
+    <datadir>suse</datadir>
+    <descriptiondir>suse/setup/descr</descriptiondir>
+    <releasepackage name="%{name}" flag="EQ" version="%{version}" release="%{release}"/>
+    <distribution>openSUSE</distribution>
+  </installconfig>
+  <runtimeconfig/>
+</product>
+
+EOF
+
+mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-Tumbleweed-Kubic-release-dvd
+cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-Tumbleweed-Kubic-release-dvd/README << EOF
+This package only exists for providing the product flavor 'dvd'.
+
+EOF
+
+%files
+%defattr(644,root,root,755)
+%{_sysconfdir}/os-release
+%{_libexecdir}/os-release
+%dir %{_sysconfdir}/products.d
+%{_sysconfdir}/products.d/*
+%dir %{_sysconfdir}/YaST2/
+%config(noreplace) %{_sysconfdir}/motd
+%dir %{_sysconfdir}/YaST2/licenses/
+%dir %{_sysconfdir}/YaST2/licenses/base/
+# no %doc here, or we will not install them
+%{_sysconfdir}/YaST2/licenses/base/license*txt
+%{_sysconfdir}/YaST2/licenses/base/no-acceptance-needed
+%dir %{_libexecdir}/issue.d
+%{_libexecdir}/issue.d/*-OS
+
+%changelog

stub.spec

@@ -1,3 +1,23 @@
-# prevent building single spec files twice
+#
+# spec file for package stub
+#
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
 Name:           stub
 Version:        0.0
+Release:        0
+
+%changelog