Add patch downstream to remove retired icfg

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
This commit is contained in:
Mohan Boddu 2021-06-09 11:43:48 -04:00
parent 4e0d9bba56
commit 2742e7ad83
2 changed files with 32 additions and 1 deletions

25
icfg-retire.patch Normal file
View File

@ -0,0 +1,25 @@
From 568462d98313ef6796304d760a620e535f110d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
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

View File

@ -4,7 +4,7 @@
Name: lorax Name: lorax
Version: 35.3 Version: 35.3
Release: 2%{?dist} Release: 3%{?dist}
Summary: Tool for creating the anaconda install images Summary: Tool for creating the anaconda install images
License: GPLv2+ License: GPLv2+
@ -14,6 +14,8 @@ URL: https://github.com/weldr/lorax
# git checkout -b archive-branch lorax-%%{version}-%%{release} # git checkout -b archive-branch lorax-%%{version}-%%{release}
# tito build --tgz # tito build --tgz
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
# https://github.com/weldr/lorax/pull/1153
Patch0: icfg-retire.patch
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: make BuildRequires: make
@ -135,6 +137,7 @@ Lorax templates for creating the boot.iso and live isos are placed in
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 -p1
%build %build
@ -175,6 +178,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
%{_datadir}/lorax/templates.d/* %{_datadir}/lorax/templates.d/*
%changelog %changelog
* Wed Jun 09 2021 Mohan Boddu <mboddu@bhujji.com> - 35.3-3
- Add patch downstream to remove retired icfg
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 35.3-2 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 35.3-2
- Rebuilt for Python 3.10 - Rebuilt for Python 3.10