--- rpms/e-smith-nutUPS/sme10/e-smith-nutUPS.spec 2020/11/27 05:14:55 1.6 +++ rpms/e-smith-nutUPS/sme10/e-smith-nutUPS.spec 2020/11/29 21:49:39 1.8 @@ -1,16 +1,17 @@ -# $Id: e-smith-nutUPS.spec,v 1.5 2020/11/19 04:26:25 jpp Exp $ +# $Id: e-smith-nutUPS.spec,v 1.7 2020/11/29 13:45:51 jcrisp Exp $ Summary: SME server - nut UPS interaction module %define name e-smith-nutUPS Name: %{name} %define version 2.6.0 -%define release 5 +%define release 6 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-bz11215-fix-line-endings.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: nut nut-client daemontools @@ -25,6 +26,9 @@ A module which configures the Network UP the SME server software. %changelog +* Sun Nov 29 2020 John Crisp 2.6.0-6.sme +- Fix preset line endings in 49-koozali.preset [SME: 11215] + * Wed Nov 18 2020 Jean-Philipe Pialasse 2.6.0-5.sme - add update event to avoid reboot [SME: 11146] - adapt nut UPS for systemd [SME: 9423] @@ -250,6 +254,8 @@ the SME server software. %prep %setup %patch0 -p1 +%patch1 -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