--- rpms/e-smith-proxy/sme10/e-smith-proxy.spec	2020/12/01 16:03:46	1.7
+++ rpms/e-smith-proxy/sme10/e-smith-proxy.spec	2021/10/22 02:06:17	1.10
@@ -1,10 +1,10 @@
-# $Id: e-smith-proxy.spec,v 1.6 2017/04/12 21:24:57 unnilennium Exp $
+# $Id: e-smith-proxy.spec,v 1.9 2021/03/16 18:52:33 jpp Exp $
 
 Summary: e-smith server and gateway - proxy module
 %define name e-smith-proxy
 Name: %{name}
 %define version 5.6.0
-%define release 7
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,6 +15,10 @@ Patch1: e-smith-proxy-5.6.0-set_file_des
 Patch2: e-smith-proxy-5.6.0.bz79.redirect.squid.related.syslog.patch
 Patch3: e-smith-proxy-5.6.0.bz9639.disablingSMTPproxyFromManager.patch
 Patch4: e-smith-proxy-5.6.0-bz11116_systemd.patch
+Patch5: e-smith-proxy-5.6.0-events_update-bz9419.patch
+Patch6: e-smith-proxy-5.6.0-bz9692-cleanup.patch
+Patch7: e-smith-proxy-5.6.0-bz11713-networksystemd.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -31,6 +35,17 @@ AutoReqProv: no
 e-smith server and gateway software - proxy module.
 
 %changelog
+* Thu Oct 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-10.sme
+- fix squid starting before network [SME: 11713]
+  also dropin file not expanded on install fixed
+
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-9.sme
+- cleanup in /etc/rc.d and /var/service/squid  [SME: 9692]
+
+* Thu Dec 10 2020 Michel Begue <mab974@gmail.com> 2.6.0-8.sme
+- fix actions for e-smith-proxy-update event [SME: 11116]
+- add intercept for squid [SME: 9419]
+
 * Mon Nov 30 2020 Michel Begue <mab974@gmail.com> 2.6.0-7.sme
 - move squid service to systemd [SME: 11116]
 - add e-smith-proxy-update event [SME: 11151]
@@ -723,6 +738,11 @@ e-smith server and gateway software - pr
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+
+rm -rf root/var/service/squid/
 mkdir -p root/usr/lib/systemd/system/squid.service.d 
 
 %build
@@ -747,5 +767,10 @@ echo "%doc COPYING" >> %{name}-%{version
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+if [ -d /var/service/squid ]; then
+ rm -rf /var/service/squid
+fi
+
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)