From e3a056a7aaac00ee13492b820de9c00f5391e870 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Mon, 2 Jan 2017 11:55:35 -0500
Subject: [PATCH] Move system dependencies for livecd-tools to
 python-imgcreate-sysdeps (#1409536) Ensure pythonX-imgcreate depend on
 python-imgcreate-sysdeps (#1409536)

---
 livecd-tools.spec | 61 +++++++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/livecd-tools.spec b/livecd-tools.spec
index 731b177..bf330ff 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -10,25 +10,40 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 24.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Base
 URL: https://github.com/rhinstaller/livecd-tools
 Source0: %{url}/archive/%{name}-%{version}.tar.gz
 
+BuildRequires: python2-devel
+%if %{with python3}
+BuildRequires: python3-devel
+%endif
+BuildRequires: /usr/bin/pod2man
+
 %if %{with python3}
 Requires: python3-imgcreate = %{epoch}:%{version}-%{release}
-Requires: python3-pyparted
 %else
 Requires: python2-imgcreate = %{epoch}:%{version}-%{release}
-Requires: pyparted
 %endif
+
+
+%description
+Tools for generating live CDs on Fedora based systems including
+derived distributions such as RHEL, CentOS and others. See
+http://fedoraproject.org/wiki/FedoraLiveCD for more details.
+
+%package -n python-imgcreate-sysdeps
+Summary: Common system dependencies for python-imgcreate
+Group: System Environment/Base
+Requires: coreutils
 Requires: mkisofs
 Requires: isomd5sum
 Requires: parted
 Requires: util-linux
-Requires: dosfstools
+Requires: dosfstools >= 2.11-8
 Requires: e2fsprogs
 Requires: lorax >= 18.3
 Requires: rsync
@@ -46,33 +61,24 @@ Requires: yaboot
 Requires: dumpet
 Requires: sssd-client
 Requires: cryptsetup
-BuildRequires: python2-devel
-%if %{with python3}
-BuildRequires: python3-devel
-%endif
-BuildRequires: /usr/bin/pod2man
+Requires: squashfs-tools
+Requires: policycoreutils
 
-
-%description
-Tools for generating live CDs on Fedora based systems including
-derived distributions such as RHEL, CentOS and others. See
-http://fedoraproject.org/wiki/FedoraLiveCD for more details.
+%description -n python-imgcreate-sysdeps
+This package describes the common system dependencies for
+python-imgcreate.
 
 %package -n python2-imgcreate
 Summary: Python 2 modules for building system images
 Group: System Environment/Base
 %{?python_provide:%python_provide python2-imgcreate}
-Requires: util-linux
-Requires: coreutils
-Requires: e2fsprogs
+Requires: python-imgcreate-sysdeps%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: pyparted
 Requires: python2-dnf >= 1.1.0
-Requires: squashfs-tools
 Requires: python-kickstart
-Requires: dosfstools >= 2.11-8
 Requires: python-six
 Requires: libselinux-python
 Requires: dbus-python
-Requires: policycoreutils
 
 %description -n python2-imgcreate
 Python 2 modules that can be used for building images for things
@@ -83,17 +89,13 @@ like live image or appliances.
 Summary: Python 3 modules for building system images
 Group: System Environment/Base
 %{?python_provide:%python_provide python3-imgcreate}
-Requires: util-linux
-Requires: coreutils
-Requires: e2fsprogs
+Requires: python-imgcreate-sysdeps%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: python3-pyparted
 Requires: python3-dnf >= 1.1.0
-Requires: squashfs-tools
 Requires: python3-kickstart
-Requires: dosfstools >= 2.11-8
 Requires: python3-six
 Requires: libselinux-python3
 Requires: python3-dbus
-Requires: policycoreutils
 
 %description -n python3-imgcreate
 Python 3 modules that can be used for building images for things
@@ -131,6 +133,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}/COPYING
 %{_bindir}/edit-livecd
 %{_bindir}/mkbiarch
 
+%files -n python-imgcreate-sysdeps
+# No files because empty metapackage
+
 %files -n python2-imgcreate
 %license COPYING
 %doc API
@@ -144,6 +149,10 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}/COPYING
 %endif
 
 %changelog
+* Mon Jan 02 2017 Neal Gompa <ngompa13@gmail.com> - 24.0-3
+- Move system dependencies for livecd-tools to python-imgcreate-sysdeps (#1409536)
+- Ensure pythonX-imgcreate depend on python-imgcreate-sysdeps (#1409536)
+
 * Wed Dec 21 2016 Kevin Fenzi <kevin@scrye.com> - 24.0-2
 - Rebuild for Python 3.6