From cae9bc7940489740c7b03e52d4ec80fc721156db Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 29 Jan 2024 10:08:54 -0800
Subject: [PATCH] Backport PR #1371 to handle pcmciautils being retired

---
 ...ime-install-drop-retired-pcmciautils.patch | 30 +++++++++++++++++++
 lorax.spec                                    |  8 ++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 0001-runtime-install-drop-retired-pcmciautils.patch

diff --git a/0001-runtime-install-drop-retired-pcmciautils.patch b/0001-runtime-install-drop-retired-pcmciautils.patch
new file mode 100644
index 0000000..451abbd
--- /dev/null
+++ b/0001-runtime-install-drop-retired-pcmciautils.patch
@@ -0,0 +1,30 @@
+From de364416f3034d5e6382de5453facd0032a760c1 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Mon, 29 Jan 2024 09:41:43 -0800
+Subject: [PATCH] runtime-install: drop retired pcmciautils
+
+pcmciautils was just retired in Rawhide:
+https://src.fedoraproject.org/rpms/pcmciautils/c/24639b0
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ share/templates.d/99-generic/runtime-install.tmpl | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl
+index d6029830..904c42ba 100644
+--- a/share/templates.d/99-generic/runtime-install.tmpl
++++ b/share/templates.d/99-generic/runtime-install.tmpl
+@@ -141,9 +141,6 @@ installpkg nmap-ncat
+ installpkg pciutils usbutils ipmitool
+ installpkg mt-st smartmontools
+ installpkg hdparm
+-%if basearch not in ("aarch64", "ppc64le", "s390x"):
+-installpkg pcmciautils
+-%endif
+ installpkg rdma-core
+ installpkg rng-tools
+ %if basearch in ("x86_64", "aarch64"):
+-- 
+2.43.0
+
diff --git a/lorax.spec b/lorax.spec
index 762c1db..218f053 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -4,7 +4,7 @@
 
 Name:           lorax
 Version:        40.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 License:        GPL-2.0-or-later
@@ -18,6 +18,9 @@ Source0:        %{name}-%{version}.tar.gz
 # https://github.com/weldr/lorax/pull/1370
 # wget replaced by wget2-wget
 Patch:          0001-runtime-install-wget2-wget-has-replaced-wget.patch
+# https://github.com/weldr/lorax/pull/1371
+# pcmciautils retired
+Patch:          0001-runtime-install-drop-retired-pcmciautils.patch
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -172,6 +175,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 %{_datadir}/lorax/templates.d/*
 
 %changelog
+* Mon Jan 29 2024 Adam Williamson <awilliam@redhat.com> - 40.3-5
+- Backport PR #1371 to handle pcmciautils being retired
+
 * Fri Jan 26 2024 Adam Williamson <awilliam@redhat.com> - 40.3-4
 - Backport PR #1370 to handle wget being replaced by wget2-wget