--- rpms/e-smith-nutUPS/sme10/e-smith-nutUPS.spec 2020/12/07 17:36:18 1.11 +++ rpms/e-smith-nutUPS/sme10/e-smith-nutUPS.spec 2021/03/27 02:12:12 1.13 @@ -1,16 +1,18 @@ -# $Id: e-smith-nutUPS.spec,v 1.10 2020/12/07 16:31:51 jpp Exp $ +# $Id: e-smith-nutUPS.spec,v 1.12 2021/03/25 01:19:15 terryfage Exp $ Summary: SME server - nut UPS interaction module %define name e-smith-nutUPS Name: %{name} %define version 2.6.0 -%define release 8 +%define release 10 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: nut nut-client daemontools @@ -25,6 +27,12 @@ A module which configures the Network UP the SME server software. %changelog +* Sat Mar 27 2021 Terry Fage 2.6.0-10.sme +- fix ExecStartPre path for /usr/lib/tmpfiles.d/nut-run.conf [SME: 11488] + +* Thu Mar 25 2021 Terry Fage 2.6.0-9.sme +- fix ExecStartPre path for nut.service [SME: 11488] + * Mon Dec 07 2020 Jean-Philipe Pialasse 2.6.0-8.sme - fix template path for monitor [SME: 9423] @@ -256,6 +264,8 @@ the SME server software. %prep %setup %patch0 -p1 +%patch1 -p1 +%patch2 -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