From 2742e7ad835c2cea8e4e8118682149871d083380 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 9 Jun 2021 11:43:48 -0400 Subject: [PATCH] Add patch downstream to remove retired icfg Signed-off-by: Mohan Boddu --- icfg-retire.patch | 25 +++++++++++++++++++++++++ lorax.spec | 8 +++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 icfg-retire.patch diff --git a/icfg-retire.patch b/icfg-retire.patch new file mode 100644 index 0000000..dddff62 --- /dev/null +++ b/icfg-retire.patch @@ -0,0 +1,25 @@ +From 568462d98313ef6796304d760a620e535f110d77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 9 Jun 2021 09:17:59 +0200 +Subject: [PATCH] Drop retired icfg + +Rawhide compose failed because icfg was retired yesterday: +https://src.fedoraproject.org/rpms/icfg/c/64ef393a109dd468b1b6950bfef70b2c45b5b903?branch=rawhide +https://pagure.io/releng/failed-composes/issue/2557 +--- + share/templates.d/99-generic/runtime-install.tmpl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 83ec12835..1aaac0907 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -173,7 +173,7 @@ installpkg python3-pyatspi + installpkg nano nano-default-editor + installpkg vim-minimal strace lsof dump xz less + installpkg wget rsync bind-utils ftp mtr vconfig +-installpkg icfg spice-vdagent ++installpkg spice-vdagent + installpkg gdisk hexedit sg3_utils + + ## actually install all the requested packages diff --git a/lorax.spec b/lorax.spec index b3650d5..bbb5a86 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,6 +14,8 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1153 +Patch0: icfg-retire.patch BuildRequires: python3-devel BuildRequires: make @@ -135,6 +137,7 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build @@ -175,6 +178,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Jun 09 2021 Mohan Boddu - 35.3-3 +- Add patch downstream to remove retired icfg + * Fri Jun 04 2021 Python Maint - 35.3-2 - Rebuilt for Python 3.10