From a0afba3ed44b389ab5f849eba455a1dd4bc8f607 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 14 2020 06:09:55 +0000
Subject: import lorax-templates-rhel-8.4-1.el8


---

diff --git a/.gitignore b/.gitignore
index c05b23c..762596d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/lorax-templates-rhel-8.3-4.tar.gz
+SOURCES/lorax-templates-rhel-8.4-1.tar.gz
diff --git a/.lorax-templates-rhel.metadata b/.lorax-templates-rhel.metadata
index 0347fa0..e746e1e 100644
--- a/.lorax-templates-rhel.metadata
+++ b/.lorax-templates-rhel.metadata
@@ -1 +1 @@
-595819f55d98cdc77d72ab279e1d5b9b597f064f SOURCES/lorax-templates-rhel-8.3-4.tar.gz
+e2214779d4e7db21f4bf972f4f91d6559c9af8de SOURCES/lorax-templates-rhel-8.4-1.tar.gz
diff --git a/SOURCES/CENTOS-add-armhfp-pkgs.patch b/SOURCES/CENTOS-add-armhfp-pkgs.patch
deleted file mode 100644
index f701ee5..0000000
--- a/SOURCES/CENTOS-add-armhfp-pkgs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uNr lorax-templates-rhel-8.1.orig/80-rhel/runtime-install.tmpl lorax-templates-rhel-8.1/80-rhel/runtime-install.tmpl
---- lorax-templates-rhel-8.1.orig/80-rhel/runtime-install.tmpl	2019-09-03 12:46:28.000000000 -0500
-+++ lorax-templates-rhel-8.1/80-rhel/runtime-install.tmpl	2019-12-31 12:06:13.556087038 -0600
-@@ -34,6 +34,13 @@
- %if basearch == "aarch64":
-     installpkg efibootmgr grub2-efi-aa64-cdboot grubby shim-aa64
- %endif
-+%if basearch in ("arm", "armhfp"):
-+    installpkg efibootmgr
-+    installpkg grub2-efi-arm-cdboot
-+    installpkg grubby-deprecated
-+    installpkg kernel-lpae
-+    installpkg uboot-tools
-+%endif
- %if basearch == "x86_64":
-     installpkg grub2-tools-efi
-     installpkg efibootmgr
diff --git a/SPECS/lorax-templates-rhel.spec b/SPECS/lorax-templates-rhel.spec
index cd67052..5e36b73 100644
--- a/SPECS/lorax-templates-rhel.spec
+++ b/SPECS/lorax-templates-rhel.spec
@@ -1,14 +1,12 @@
 Name:           lorax-templates-rhel
-Version:        8.3
-Release:        4%{?dist}
+Version:        8.4
+Release:        1%{?dist}
 Summary:        RHEL8 build templates for lorax and livemedia-creator
 
 License:        GPLv2+
 URL:            https://github.com/weldr/lorax
 BuildArch:      noarch
-Source0:        lorax-templates-rhel-8.3-4.tar.gz
-
-Patch1:         CENTOS-add-armhfp-pkgs.patch
+Source0:        lorax-templates-rhel-8.4-1.tar.gz
 
 # Where are these supposed to end up?
 %define templatedir %{_datadir}/lorax/templates.d/80-rhel
@@ -19,7 +17,6 @@ placed in %{templatedir}
 
 %prep
 %setup
-%patch1 -p1
 
 %build
 # nothing to build
@@ -34,6 +31,10 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
+* Wed Oct 28 2020 Brian C. Lane <bcl@redhat.com> - 8.4-1
+-  Install Xorg and tigervnc-server on s390 boot.iso (bcl)
+   Resolves: rhbz#1854933
+
 * Tue Jul 07 2020 Brian C. Lane <bcl@redhat.com> - 8.3-4
 - rsyslog: Disable journal ratelimits during install
   Related: rhbz#1752754