diff --git a/9999-revert-bca4b0df03b2831c31ace011fdcf3c6e73c9df66.patch b/9999-revert-bca4b0df03b2831c31ace011fdcf3c6e73c9df66.patch new file mode 100644 index 0000000..addfa13 --- /dev/null +++ b/9999-revert-bca4b0df03b2831c31ace011fdcf3c6e73c9df66.patch @@ -0,0 +1,22 @@ +From bca4b0df03b2831c31ace011fdcf3c6e73c9df66 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Feb 04 2017 23:39:27 +0000 +Subject: Revert Fix import for compatibility with livecd-tools v24 + + +--- + +diff --git a/appcreate/__init__.py b/appcreate/__init__.py +index 4bed653..0c4cebf 100644 +--- a/appcreate/__init__.py ++++ b/appcreate/__init__.py +@@ -19,7 +19,7 @@ + + from imgcreate.live import * + from imgcreate.creator import * +-from imgcreate.dnfinst import * ++from imgcreate.yuminst import * + from imgcreate.kickstart import * + from imgcreate.fs import * + from imgcreate.debug import * + diff --git a/appliance-tools.spec b/appliance-tools.spec index ac9778a..192ee10 100644 --- a/appliance-tools.spec +++ b/appliance-tools.spec @@ -15,9 +15,18 @@ Patch3: 0001-Use-block-size-with-xz-to-make-seekable-xz-compresse.patch Patch4: 0001-Remove-usage-of-kickstart.get_modules-rhbz-1544075.patch Patch5: lookup-fake-user-for-nss.patch +%if 0%{?rhel} == 7 +Patch9999: 9999-revert-bca4b0df03b2831c31ace011fdcf3c6e73c9df66.patch +%endif + # Ensure system deps are installed (rhbz#1409536) +%if 0%{?rhel} == 7 +Requires: python-imgcreate +Requires: python-urlgrabber +%else Requires: python2-imgcreate >= 1:25.0-2 Requires: python2-urlgrabber +%endif Requires: curl rsync kpartx Requires: zlib Requires: qemu-img @@ -25,7 +34,9 @@ Requires: xz Requires: xfsprogs Requires: sssd-client BuildRequires: python2-devel +%if 0%{?fedora} BuildRequires: python-unversioned-command +%endif BuildRequires: /usr/bin/pod2man BuildArch: noarch @@ -57,8 +68,15 @@ rm -fv %{buildroot}%{_pkgdocdir}/COPYING %dir %{python2_sitelib}/ec2convert %{python2_sitelib}/appcreate/* %{python2_sitelib}/ec2convert/* +%if 0%{?rhel} == 7 +/usr/share/doc/appliance-tools/COPYING +/usr/share/doc/appliance-tools/README +%endif %changelog +* Tue Nov 13 2018 Pablo Greco - 008.0-10 +- Add compatibility with el7 + * Thu Jul 12 2018 Fedora Release Engineering - 008.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild