From 36b71b0c56fedabc44da7e057baafc9f210a153d940eb3347cf84bc595bdb33f Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Wed, 30 Oct 2019 10:55:53 +0000
Subject: [PATCH] - More adjustments for Leap-release-*

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=60
---
 config.sh                   | 4 ++--
 list-kde.sh                 | 1 -
 list-xfce.sh                | 1 -
 livecd-leap-kde.kiwi        | 1 -
 livecd-openSUSE.changes     | 5 +++++
 livecd-tumbleweed-kde.kiwi  | 1 -
 livecd-tumbleweed-xfce.kiwi | 1 -
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config.sh b/config.sh
index ee8c21f..e34ff75 100644
--- a/config.sh
+++ b/config.sh
@@ -19,9 +19,9 @@ set -euxo pipefail
 exec | tee /var/log/config.log
 exec 2>&1
 
-pl=$(rpmqpack | grep openSUSE-release-livecd-)
+pl=$(rpmqpack | grep release-livecd-)
 
-# Get the flavor from the installed openSUSE-release-livecd- RPM
+# Get the flavor from the installed (openSUSE|Leap)-release-livecd- RPM
 # as <censored> kiwi does not make the flavor accessible
 desktop=$(echo "$pl" | awk -F- '{ print $4 }' | tr A-Z a-z)
 
diff --git a/list-kde.sh b/list-kde.sh
index 142fbf9..84e1eb0 100644
--- a/list-kde.sh
+++ b/list-kde.sh
@@ -12,7 +12,6 @@ buildignore akregator
 buildignore ImageMagick
 install patterns-kde-kde
 installPattern kde
-install openSUSE-release-livecd-kde
 install plasma5-workspace-branding-openSUSE
 install baloo5-tools
 install NetworkManager
diff --git a/list-xfce.sh b/list-xfce.sh
index 6a36b23..e3efaa1 100644
--- a/list-xfce.sh
+++ b/list-xfce.sh
@@ -3,7 +3,6 @@ buildignore samba-libs
 install yast2-trans-stats
 install patterns-xfce-xfce
 installPattern xfce
-install openSUSE-release-livecd-xfce
 buildignore gnome-themes-accessibility
 buildignore xlockmore
 buildignore unzip-doc
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index de6af94..442f691 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -435,7 +435,6 @@
     <ignore name="ImageMagick"/>
     <package name="patterns-kde-kde"/>
     <namedCollection name="kde"/>
-    <package name="openSUSE-release-livecd-kde"/>
     <package name="plasma5-workspace-branding-openSUSE"/>
     <package name="baloo5-tools"/>
     <package name="NetworkManager"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 2e3f578..3383e99 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 30 10:54:55 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- More adjustments for Leap-release-*
+
 -------------------------------------------------------------------
 Wed Oct 30 09:53:50 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 9569279..4c80db3 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -435,7 +435,6 @@
     <ignore name="ImageMagick"/>
     <package name="patterns-kde-kde"/>
     <namedCollection name="kde"/>
-    <package name="openSUSE-release-livecd-kde"/>
     <package name="plasma5-workspace-branding-openSUSE"/>
     <package name="baloo5-tools"/>
     <package name="NetworkManager"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 92bd08a..0d2f4fc 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -415,7 +415,6 @@
     <package name="yast2-trans-stats"/>
     <package name="patterns-xfce-xfce"/>
     <namedCollection name="xfce"/>
-    <package name="openSUSE-release-livecd-xfce"/>
     <package name="aaa_base" replaces="gnome-themes-accessibility"/>
     <ignore name="gnome-themes-accessibility"/>
     <package name="aaa_base" replaces="xlockmore"/>