diff --git a/cobbler.spec b/cobbler.spec index 8f833b8..3804ff9 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -7,7 +7,7 @@ Name: cobbler Version: 2.8.5 -Release: 0.1%{?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 @@ -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 @@ -78,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 @@ -102,13 +106,14 @@ 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 Requires: python-ethtool Requires: python-urlgrabber %endif +Requires: /sbin/service Requires: virt-install %description -n koan @@ -264,6 +269,12 @@ 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 + * Mon Aug 26 2019 Nicolas Chauvet - 2.8.5-0.1 - Update to 2.8.5 - pre-release