--- rpms/e-smith-nutUPS/sme10/e-smith-nutUPS.spec 2016/02/05 22:27:53 1.2 +++ rpms/e-smith-nutUPS/sme10/e-smith-nutUPS.spec 2021/03/25 01:19:15 1.12 @@ -1,15 +1,18 @@ -# $Id: e-smith-nutUPS.spec,v 1.1 2016/02/05 22:19:01 stephdl Exp $ +# $Id: e-smith-nutUPS.spec,v 1.11 2020/12/07 17:36:18 jpp Exp $ Summary: SME server - nut UPS interaction module %define name e-smith-nutUPS Name: %{name} %define version 2.6.0 -%define release 1 +%define release 9 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 + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: nut nut-client daemontools Obsoletes: neon <= 0.25.5 @@ -23,7 +26,20 @@ A module which configures the Network UP the SME server software. %changelog -* Fri Feb 05 2016 stephane de Labrusse 2.6.0-1.sme +* 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] + +* 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] + +* Fri Feb 05 2016 stephane de Labrusse 2.6.0-2.sme - Initial release to sme10 * Sat Feb 07 2015 stephane de Labrusse 2.4.0-9.sme @@ -243,6 +259,12 @@ 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 + %build perl createlinks