--- rpms/e-smith-base/sme10/e-smith-base.spec 2021/03/21 20:40:56 1.111 +++ rpms/e-smith-base/sme10/e-smith-base.spec 2021/03/30 21:54:33 1.112 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.110 2021/03/19 04:30:13 jpp Exp $ +# $Id: e-smith-base.spec,v 1.111 2021/03/21 20:40:56 jpp Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.8.0 -%define release 92 +%define release 93 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -76,6 +76,7 @@ Patch62: e-smith-base-5.8.0-bz9692-clean Patch63: e-smith-base-5.8.0-bz11345-systemctlWrapper.patch Patch64: e-smith-base-5.8.0-bz11470.patch Patch65: e-smith-base-5.8.0-bz11479-BeforeMasq.patch +Patch66: e-smith-base-5.8.0-bz10657-dhcpmanagerFragmentMerge.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: pwauth @@ -220,6 +221,7 @@ rm -rf root/etc/rc.d/init.d/supervise %patch63 -p1 %patch64 -p1 %patch65 -p1 +%patch66 -p1 %build @@ -325,6 +327,9 @@ fi %changelog +* Tue Mar 30 2021 Jean-Philippe Pialasse 5.8.0-93.sme +- merge dhcpdmanager custom template fragments with core [SME: 10657] + * Sun Mar 21 2021 Jean-Philippe Pialasse 5.8.0-92.sme - fix masq failing on initial boot [SME: 11479]