From cc56685952dd5ff8471fbd0ad98ae5c1f64d21b8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 10 Oct 2019 18:22:53 -0600 Subject: [PATCH 1/3] Require /sbin/service --- cobbler.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cobbler.spec b/cobbler.spec index df1242e..0ed81b3 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -7,7 +7,7 @@ Name: cobbler Version: 2.8.5 -Release: 0.1%{?dist} +Release: 0.2%{?dist} Summary: Boot server configurator URL: http://cobbler.github.io/ License: GPLv2+ @@ -52,6 +52,8 @@ Requires: dnf-plugins-core %else Requires: yum-utils %endif +# https://github.com/cobbler/cobbler/issues/1685 +Requires: /sbin/service %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: systemd Requires(post): systemd @@ -109,6 +111,7 @@ Requires: python2-urlgrabber Requires: python-ethtool Requires: python-urlgrabber %endif +Requires: /sbin/service Requires: virt-install %description -n koan @@ -264,6 +267,9 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/ %changelog +* Thu Oct 10 2019 Orion Poplawski - 2.8.5-0.2 +- Require /sbin/service + * Mon Aug 26 2019 Nicolas Chauvet - 2.8.5-0.1 - Update to 2.8.5 - pre-release From b3db39dbee5501ac3c886e46e669be180f6da381 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 14 Oct 2019 19:53:47 -0600 Subject: [PATCH 2/3] Require python2-iptables --- cobbler.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/cobbler.spec b/cobbler.spec index 0ed81b3..a7ff0a3 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -7,7 +7,7 @@ Name: cobbler Version: 2.8.5 -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: Boot server configurator URL: http://cobbler.github.io/ License: GPLv2+ @@ -18,7 +18,7 @@ BuildRequires: /usr/bin/pathfix.py BuildRequires: python2-devel BuildRequires: python2-pyyaml BuildRequires: python2-setuptools -%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: python2-cheetah %else BuildRequires: python-cheetah @@ -30,7 +30,7 @@ Requires: createrepo Requires: rsync Requires: python2-simplejson Requires: python2-pyyaml -%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 Requires: python2-mod_wsgi Requires: python2-cheetah Requires: python2-netaddr @@ -80,13 +80,15 @@ other applications. Summary: Web interface for Cobbler BuildArch: noarch Requires: cobbler -%if 0%{?fedora} >= 28 +%if 0%{?fedora} Requires: python2-django1.11 +Requires: python2-ipaddress %endif %if 0%{?el7} Requires: python2-django +Requires: python-ipaddress %endif -%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 Requires: python2-mod_wsgi %else Requires: Django > 1.6 @@ -104,7 +106,7 @@ http://server/cobbler_web to configure the install server. Summary: Helper tool that performs cobbler orders on remote machines BuildArch: noarch Requires: python2-simplejson -%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 Requires: python2-ethtool Requires: python2-urlgrabber %else @@ -267,6 +269,9 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/ %changelog +* Mon Oct 14 2019 Orion Poplawski - 2.8.5-0.3 +- Require python2-iptables + * Thu Oct 10 2019 Orion Poplawski - 2.8.5-0.2 - Require /sbin/service From 3fffbe1bfc64d6584722cfe69d6734228fd1ae29 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 14 Oct 2019 20:01:17 -0600 Subject: [PATCH 3/3] Fix changelog --- cobbler.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobbler.spec b/cobbler.spec index a7ff0a3..17b016e 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -270,7 +270,7 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/ %changelog * Mon Oct 14 2019 Orion Poplawski - 2.8.5-0.3 -- Require python2-iptables +- Require python2-ipaddress * Thu Oct 10 2019 Orion Poplawski - 2.8.5-0.2 - Require /sbin/service