From 657d95aae22c923d4ccd6ac4debebd578c406176 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Nov 25 2018 18:15:28 +0000
Subject: Make koan require python2-ethtool (BZ 1638933)


---

diff --git a/cobbler.spec b/cobbler.spec
index 1a1cfa2..fb73ce0 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -7,7 +7,7 @@
 
 Name:           cobbler
 Version:        2.8.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Boot server configurator
 URL:            http://cobbler.github.io/
 License:        GPLv2+
@@ -15,34 +15,30 @@ Source0:        https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%
 
 BuildRequires: git
 BuildRequires: python2-devel
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
 BuildRequires: python2-pyyaml
-BuildRequires: python2-cheetah
 BuildRequires: python2-setuptools
+%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+BuildRequires: python2-cheetah
 %else
-BuildRequires: PyYAML
 BuildRequires: python-cheetah
-BuildRequires: python-setuptools
 %endif
 
 Requires: httpd
 Requires: tftp-server
 Requires: createrepo
 Requires: rsync
+Requires: python2-simplejson
+Requires: python2-pyyaml
 %if 0%{?fedora} >= 28 || 0%{?rhel} > 7
 Requires: python2-mod_wsgi
 Requires: python2-cheetah
 Requires: python2-netaddr
-Requires: python2-simplejson
 Requires: python2-urlgrabber
-Requires: python2-pyyaml
 %else
 Requires: mod_wsgi
 Requires: python-cheetah
 Requires: python-netaddr
-Requires: python-simplejson
 Requires: python-urlgrabber
-Requires: PyYAML
 %endif
 # syslinux is only available on x86
 %ifarch %{ix86} x86_64
@@ -101,11 +97,12 @@ http://server/cobbler_web to configure the install server.
 Summary:        Helper tool that performs cobbler orders on remote machines
 Group:          Applications/System
 BuildArch:      noarch
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
 Requires:       python2-simplejson
+%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+Requires:       python2-ethtool
 Requires:       python2-urlgrabber
 %else
-Requires:       python-simplejson
+Requires:       python-ethtool
 Requires:       python-urlgrabber
 %endif
 Requires:       virt-install
@@ -262,8 +259,11 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 
 
 %changelog
+* Sun Nov 25 2018 Orion Poplawski <orion@nwra.com> - 2.8.4-2
+- Make koan require python2-ethtool (BZ 1638933)
+
 * Sat Nov 24 2018 Orion Poplawski <orion@nwra.com> - 2.8.4-1
-- Update to 2.8.4
+- Update to 2.8.4 (Fixes BZ 1613292, 1643860, 1614433, CVE-2018-1000226, CVE-2018-10931)
 
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild