From 778e1f9fe213bb04d622d50d8ab4e6d5759bf221b7c275dabde464030c1de79c Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Thu, 31 Oct 2019 08:15:53 +0000
Subject: [PATCH 1/2] Updating link to change in
 openSUSE:Factory/livecd-openSUSE revision 81.0

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

diff --git a/list-gnome.sh b/list-gnome.sh
index 03d1ceb..eca71a9 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -81,6 +81,9 @@ buildignore gnome-photos
 # Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD
 buildignore cyrus-sasl
 
+# Was part of the gnome pattern
+install NetworkManager-applet
+
 # Moved here from list-common.sh, too big for x11
 install xf86-video-vmware i686,x86_64
 
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index abd2969..95af28a 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -514,6 +514,7 @@
     <ignore name="gnome-photos"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
+    <package name="NetworkManager-applet"/>
     <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="alsa-firmware"/>
     <namedCollection name="apparmor"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 3383e99..c5fed7a 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 31 08:13:59 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- list-gnome: explicitly list NetworkManager-applet (otherwise:
+  have choice for NetworkManager-client needed by NetworkManager:
+  NetworkManager-applet plasma-nm5).
+
 -------------------------------------------------------------------
 Wed Oct 30 10:54:55 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 5bafcca..083c6ba 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -514,6 +514,7 @@
     <ignore name="gnome-photos"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
+    <package name="NetworkManager-applet"/>
     <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="alsa-firmware"/>
     <namedCollection name="apparmor"/>

From 5391cad12be670ec2658708aee9f3a5993727fc6bc066607fe515a520db59adc Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 11 Nov 2019 09:02:07 +0000
Subject: [PATCH 2/2] - Comment Leap-release change out again, as reverted in
 000package-groups

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=62
---
 livecd-leap-gnome.kiwi  | 4 ++--
 livecd-leap-kde.kiwi    | 4 ++--
 livecd-leap-x11.kiwi    | 4 ++--
 livecd-openSUSE.changes | 5 +++++
 pre-checkin.sh          | 3 ++-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 95af28a..35bde4b 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -542,8 +542,8 @@
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>
-    <package name="Leap-release"/>
-    <package name="Leap-release-livecd-gnome"/>
+    <package name="openSUSE-release"/>
+    <package name="openSUSE-release-livecd-gnome"/>
     <package name="branding-openSUSE"/>
   </packages>
   <repository type="rpm-md">
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 442f691..ac98985 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -497,8 +497,8 @@
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>
-    <package name="Leap-release"/>
-    <package name="Leap-release-livecd-kde"/>
+    <package name="openSUSE-release"/>
+    <package name="openSUSE-release-livecd-kde"/>
     <package name="branding-openSUSE"/>
   </packages>
   <repository type="rpm-md">
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 135abaf..c3046fd 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -548,8 +548,8 @@
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>
-    <package name="Leap-release"/>
-    <package name="Leap-release-livecd-x11"/>
+    <package name="openSUSE-release"/>
+    <package name="openSUSE-release-livecd-x11"/>
     <package name="branding-openSUSE"/>
   </packages>
   <repository type="rpm-md">
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index c5fed7a..4664fc9 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 11 09:01:22 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Comment Leap-release change out again, as reverted in 000package-groups
+
 -------------------------------------------------------------------
 Thu Oct 31 08:13:59 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
 
diff --git a/pre-checkin.sh b/pre-checkin.sh
index 0a681a6..6c3c5aa 100644
--- a/pre-checkin.sh
+++ b/pre-checkin.sh
@@ -37,7 +37,8 @@ for distro in leap tumbleweed; do
 	if [ "${distro}" = "leap" ]; then
 		distroname="openSUSE Leap %OS_VERSION_ID%"
 		bootsplash="openSUSE"
-		releaseprefix="Leap"
+		# This changes every few weeks, apparently.
+		#releaseprefix="Leap"
 	fi
 
 	for flavor in gnome kde xfce x11; do