From 6557734f1ad4de80791cc00387fb79bdb04e89ba Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Wed, 24 Oct 2018 00:20:31 -0700
Subject: [PATCH] design suite: temporarily comment conflicting applications

---
 fedora-atomic.ks            |  2 +-
 fedora-live-design_suite.ks |  8 ++++++--
 fedora-lxqt-common.ks       |  7 ++++++-
 fedora-scientific-common.ks | 11 +++++++++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/fedora-atomic.ks b/fedora-atomic.ks
index 3440aed..cde4738 100644
--- a/fedora-atomic.ks
+++ b/fedora-atomic.ks
@@ -68,7 +68,7 @@ reboot
 # This location is where the compose gets synced to after the compose
 # is done.
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-30-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks
index 90503bc..aef6f0a 100644
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -32,14 +32,18 @@ powerline
 powerline-fonts
 
 # Extra wallpapers
-# f26-backgrounds-extras-base
-# f26-backgrounds-extras-gnome
+f28-backgrounds-extras-base
+f28-backgrounds-extras-gnome
 
 # removal of unneeded applications
 -gnome-boxes
 -eog
 -rdesktop
 
+# temporarily removing conflicting application
+-LuxRender-blender
+-mypaint
+
 %end
 
 %post
diff --git a/fedora-lxqt-common.ks b/fedora-lxqt-common.ks
index 4ac7ed1..730823c 100644
--- a/fedora-lxqt-common.ks
+++ b/fedora-lxqt-common.ks
@@ -27,7 +27,11 @@ pavucontrol-qt-l10n
 # MP3
 gstreamer1-plugin-mpg123
 
+<<<<<<< HEAD
 # Editor
+=======
+# Text Editor
+>>>>>>> master
 enki
 
 # remove unneeded stuff to get a lightweight system
@@ -45,7 +49,8 @@ wqy-microhei-fonts          # a compact CJK font, to replace:
 -@input-methods
 -scim*
 -m17n*
--ibus*
+# Temporary include ibus to workaround RHBZ 1633225
+# -ibus*
 -iok
 
 # Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132
diff --git a/fedora-scientific-common.ks b/fedora-scientific-common.ks
index c033cf2..b775757 100644
--- a/fedora-scientific-common.ks
+++ b/fedora-scientific-common.ks
@@ -70,14 +70,25 @@ rkward
 qtoctave
 
 # julia
+<<<<<<< HEAD
 # Comment out till https://koji.fedoraproject.org/koji/buildinfo?buildID=1135023 is fixed
+=======
+# Comment out till build failure is sorted
+>>>>>>> master
 # julia
 # julia-doc
 
 # IDEs for the IDE folks
 @eclipse
+<<<<<<< HEAD
 # Workaround for: https://pagure.io/releng/issue/7814
 -eclipse-linuxtools-vagrant
+=======
+
+# Workaround for https://pagure.io/releng/issue/7814
+-eclipse-linuxtools-vagrant
+
+>>>>>>> master
 spyder
 
 #writing & publishing