--- rpms/e-smith-base/sme10/e-smith-base.spec	2021/12/20 14:55:17	1.128
+++ rpms/e-smith-base/sme10/e-smith-base.spec	2022/02/17 22:06:31	1.129
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.127 2021/12/20 14:11:53 jpp Exp $
+# $Id: e-smith-base.spec,v 1.128 2021/12/20 14:55:17 jpp Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.8.1
-%define release 6
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -16,6 +16,7 @@ Patch2: e-smith-base-5.8.1-bz11766-group
 #keeping this one for SME11
 # Patch: e-smith-base-5.8.1-bz11772-ellipticcert.patch
 Patch3: e-smith-base-5.8.1-bz11795-persistent-journald.patch
+Patch4: e-smith-base-5.8.1-bz946-bz10484-bz11813-logs.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: pwauth
@@ -79,6 +80,7 @@ e-smith server and gateway software - ba
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 
@@ -108,6 +110,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/selinux
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
     --file /sbin/e-smith/systemd/mdmonitor-pre 'attr(0554,root,root)' \
+    --file /sbin/e-smith/systemd/rsyslog-pre 'attr(0554,root,root)' \
     --file /etc/cron.daily/conf-mod_ssl 'attr(0544,root,root)' \
     --dir /var/log/dhcpd 'attr(2750,smelog,smelog)' \
     --dir /etc/e-smith/pam 'attr(0700,root,root)' \
@@ -184,6 +187,13 @@ fi
 
 
 %changelog
+* Thu Feb 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.8.1-7.sme
+- make rsyslog listen journald which listen /dev/log [SME: 11813]
+  template for /etc/systemd/journald.conf
+- properly configure /etc/logrotate.conf [SME: 10484]
+  template for /etc/logrotate.conf
+- drop e-smith logrotate actions creating dangling links [SME: 946]
+
 * Mon Dec 20 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.8.1-6.sme
 - make journald log permanent by creating /var/log/journal [SME: 11795]