--- rpms/e-smith-nutUPS/sme10/e-smith-nutUPS.spec 2021/03/27 02:12:12 1.13 +++ rpms/e-smith-nutUPS/sme10/e-smith-nutUPS.spec 2021/03/30 12:00:52 1.14 @@ -1,10 +1,10 @@ -# $Id: e-smith-nutUPS.spec,v 1.12 2021/03/25 01:19:15 terryfage Exp $ +# $Id: e-smith-nutUPS.spec,v 1.13 2021/03/27 02:12:12 terryfage Exp $ Summary: SME server - nut UPS interaction module %define name e-smith-nutUPS Name: %{name} %define version 2.6.0 -%define release 10 +%define release 11 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -13,6 +13,7 @@ Source: %{name}-%{version}.tar.xz Patch0: e-smith-nutUPS-2.6.0-bz9423-bz11146.patch Patch1: e-smith-nutUPS-2.6.0-bz11488.patch Patch2: e-smith-nutUPS-2.6.0-bz11494.patch +Patch3: e-smith-nutUPS-2.6.0-nutstartorder-bz11488.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: nut nut-client daemontools @@ -27,6 +28,9 @@ A module which configures the Network UP the SME server software. %changelog +* Tue Mar 30 2021 Terry Fage 2.6.0-11.sme +- fix start ordering nut.service [SME: 11488] + * Sat Mar 27 2021 Terry Fage 2.6.0-10.sme - fix ExecStartPre path for /usr/lib/tmpfiles.d/nut-run.conf [SME: 11488] @@ -266,6 +270,7 @@ the SME server software. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 rm -rf root/etc/rc.d/init.d/nut root/etc/rc.d/rc7.d/S38nut mkdir -p root/usr/lib/systemd/system/nut-monitor.service.d root/usr/lib/systemd/system/nut-server.service.d