From 3fdf6dde17511e3c761f9b063a2c2e0b058bd30d Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Mon, 8 Feb 2021 11:31:04 -0800
Subject: [PATCH] Update to upstream v34.8-1 from rhel9-branch tag
 lorax-34.8-1.el9

---
 .gitignore |  1 +
 lorax.spec | 22 +++++++++++++++++-----
 sources    |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index ebc882d..b06f081 100644
--- a/.gitignore
+++ b/.gitignore
@@ -190,3 +190,4 @@
 /lorax-34.2.tar.gz
 /lorax-34.3.tar.gz
 /lorax-34.5.tar.gz
+/lorax-34.8.tar.gz
diff --git a/lorax.spec b/lorax.spec
index d65c909..fff0494 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -3,8 +3,8 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        34.5
-Release:        2%{?dist}
+Version:        34.8
+Release:        1%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 License:        GPLv2+
@@ -121,6 +121,7 @@ Requires: anaconda-core
 Requires: anaconda-tui
 Requires: anaconda-install-env-deps
 Requires: system-logos
+Requires: python3-psutil
 
 %description lmc-novirt
 Additional dependencies required by livemedia-creator when using it with --no-virt
@@ -195,9 +196,20 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 %{_mandir}/man1/composer-cli.1*
 
 %changelog
-* Tue Dec 08 2020 Brian C. Lane <bcl@redhat.com> - 34.5-2
-- lorax.spec: Drop GConf2 requirement
-  Resolves: rhbz#1904955
+* Mon Feb 08 2021 Brian C. Lane <bcl@redhat.com> 34.8-1
+- Use image dependencies metapackage (vslavik@redhat.com)
+- tests: Include the fedora-updates repo when testing boot.iso building (bcl@redhat.com)
+
+* Wed Jan 20 2021 Brian C. Lane <bcl@redhat.com> 34.7-1
+- live/x86.tmpl: Copy livecd-iso-to-disk script, if installed (david.ward@ll.mit.edu)
+- templates: Copy license files from the correct path (david.ward@ll.mit.edu)
+- test: Fix vm.install for non-LVM cloud images (martin@piware.de)
+
+* Wed Dec 16 2020 Brian C. Lane <bcl@redhat.com> 34.6-1
+- Remove LD_PRELOAD libgomp.so.1 from lmc --no-virt (bcl@redhat.com)
+- Add POSTIN scriptlet error to the log monitor list (bcl@redhat.com)
+- Improve lmc no-virt error handling (bcl@redhat.com)
+- lorax.spec: Drop GConf2 requirement (bcl@redhat.com)
 
 * Mon Nov 30 2020 Brian C. Lane <bcl@redhat.com> 34.5-1
 - Don't remove libldap_r libraries during runtime-cleanup.tmpl (spichugi@redhat.com)
diff --git a/sources b/sources
index fb43f4c..ab387d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lorax-34.5.tar.gz) = a5507727c8d333cbae6362bf21e69f419ec7a211c2d5039fceae51207e4a95161b522c46932b5e7148ec308eb676cc83240f9cae6685934687e9d3048d2bd881
+SHA512 (lorax-34.8.tar.gz) = 22a19d83b5a20f2f893ac1626c9518778b6c637b1785472fdb037400abefbf48d4c332bfb681eee88815c526971c785129ede61ac7028e1050f68a2ca71a451a