--- rpms/e-smith-cvm-unix-local/sme10/e-smith-cvm-unix-local.spec	2021/01/09 04:55:33	1.3
+++ rpms/e-smith-cvm-unix-local/sme10/e-smith-cvm-unix-local.spec	2022/05/27 02:14:06	1.12
@@ -1,19 +1,22 @@
-# $Id: e-smith-cvm-unix-local.spec,v 1.2 2016/02/04 23:26:07 vip-ire Exp $
+# $Id: e-smith-cvm-unix-local.spec,v 1.11 2022/03/08 18:39:56 jpp Exp $
 
 Summary: Module for supervising cvm auth daemon
 %define name e-smith-cvm-unix-local
 Name: %{name}
 %define version 2.6.0
-%define release 2
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
-Patch: e-smith-cvm-unix-local-2.6.0-bz11314-bz11125-systemd-update.patch
+Patch0: e-smith-cvm-unix-local-2.6.0-bz11314-bz11125-systemd-update.patch
+Patch1: e-smith-cvm-unix-local-2.6.0-bz11792-alwaysreload.patch
+Patch2: e-smith-cvm-unix-local-2.6.0-bz11807-log.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-Requires: cvm daemontools
+Requires: cvm >= 0.97
+#Requires: daemontools
 Requires: e-smith-lib >= 1.13.1-90
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -23,6 +26,32 @@ AutoReqProv: no
 Module for supervising cvm auth daemon
 
 %changelog
+* Thu May 26 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-10.sme
+- fix error compressing log still in use by delaying it [SME: 11968]
+
+* Tue Mar 08 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-9.sme
+- reverting to release 7 state [SME: 11885]
+
+* Tue Mar 08 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 2.6.0-8.sme
+- Add yum action to restart post install [SME: 11885]
+
+* Tue Mar 08 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- bump requirement for cvm [SME: 11885]
+  removing daemontools requirement 
+
+* Fri Feb 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-6.sme
+- expand rsyslog.conf [SME: 11807]
+
+* Thu Feb 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-5.sme
+- redirect and rotate log for cvm-unix [SME: 11807]
+  fix cvm-pre script permission
+
+* Tue Dec 14 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-4.sme
+- fix service stopping restarting on crash [SME: 11792]
+
+* Mon Jan 11 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-3.sme
+- fix typo [SME: 11314]
+
 * Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
 - migrate to systemd [SME: 11314]
 - add update event [SME: 11125]
@@ -89,8 +118,10 @@ Module for supervising cvm auth daemon
 
 %prep
 %setup
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 rm -rf root/var/service
+%patch2 -p1
 
 %build
 perl createlinks
@@ -102,6 +133,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/cvm
 mkdir -p $RPM_BUILD_ROOT/var/log/cvm
 mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system/sme-server.target.wants
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+  --file /sbin/e-smith/systemd/cvm-unix-pre 'attr(0554,root,root)' \
   --dir /var/lib/cvm 'attr(0755,root,root)' \
   --dir /var/log/cvm 'attr(0750,cvmlog,cvmlog)' \
   > %{name}-%{version}-%{release}-filelist