diff --git a/livecd-tools.spec b/livecd-tools.spec index 1c468f7..214f2d1 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -17,7 +17,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 25.0 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 License: GPLv2 Group: System Environment/Base @@ -89,8 +89,9 @@ Requires: cryptsetup Requires: squashfs-tools Requires: policycoreutils Requires: selinux-policy-targeted -Requires: dracut >= 045 -%if %{with python2} +# dracut 045+ required for overlayfs live media support +Requires: dracut +%if ! %{with python2} Obsoletes: python2-imgcreate < 1:25.0-12 %endif @@ -104,12 +105,20 @@ Summary: Python 2 modules for building system images Group: System Environment/Base %{?python_provide:%python_provide python2-imgcreate} Requires: python-imgcreate-sysdeps%{?_isa} = %{epoch}:%{version}-%{release} -Requires: python2-pyparted Requires: python2-dnf >= 1.1.0 +%if 0%{?rhel} && 0%{?rhel} < 8 +Requires: pyparted +Requires: pykickstart +Requires: libselinux-python +Requires: dbus-python +Requires: python-six +%else +Requires: python2-pyparted Requires: python2-kickstart -Requires: python2-six Requires: python2-libselinux Requires: python2-dbus +Requires: python2-six +%endif %description -n python2-imgcreate Python 2 modules that can be used for building images for things @@ -166,8 +175,8 @@ Tools for installing Live CD ISOs to different mediums %make_install PYTHON=python3 %endif -# Delete license file from docs, we'll grab it later -rm -rf %{buildroot}%{_datadir}/doc/%{name}/COPYING +# Delete docs, we'll grab them later +rm -rf %{buildroot}%{_datadir}/doc/%{name} %ifnarch %{ix86} x86_64 # livecd-iso-to-mediums doesn't work without syslinux @@ -215,6 +224,10 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-* %endif %changelog +* Thu Nov 15 2018 Neal Gompa - 1:25.0-13 +- Fix when Python 2 subpackage is obsoleted +- Fix up EL7 support + * Tue Nov 13 2018 Neal Gompa - 1:25.0-12 - Drop Python 2 subpackage for F30+/RHEL8+