From 4ed8614a83cc48b6f45dc5155fe9a0d2105062b4 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 30 Dec 2019 10:23:44 -0500 Subject: [PATCH] Fix dependency on livecd-tools for non-Fedora --- appliance-tools.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/appliance-tools.spec b/appliance-tools.spec index 5af8435..850db06 100644 --- a/appliance-tools.spec +++ b/appliance-tools.spec @@ -9,6 +9,15 @@ %global python_pkgversion %{python3_pkgversion} %endif +# Minimum version of imgcreate (livecd-tools) +%global min_imgcreate_ver 25.0-2 + +%if 0%{?fedora} +%global min_imgcreate_evr 1:%{min_imgcreate_ver} +%else +%global min_imgcreate_evr %{min_imgcreate_ver} +%endif + Name: appliance-tools Summary: Tools for building Appliances Version: 009.0 @@ -23,7 +32,7 @@ Patch0001: 0001-fstype-is-optional-for-swap-check-mountpoint-also.patch Patch0002: 0001-Leave-more-space-4MB-for-uboot-before-the-first-part.patch # Ensure system deps are installed (rhbz#1409536) -Requires: python%{python_pkgversion}-imgcreate >= 1:25.0-2 +Requires: python%{python_pkgversion}-imgcreate %{?min_imgcrate_evr:>= %{min_imgcreate_evr}} Requires: python%{python_pkgversion}-progress Requires: python%{python_pkgversion}-future Requires: curl rsync kpartx