--- rpms/e-smith-proxy/sme10/e-smith-proxy.spec 2020/12/11 20:35:23 1.8 +++ rpms/e-smith-proxy/sme10/e-smith-proxy.spec 2021/03/16 18:52:33 1.9 @@ -1,10 +1,10 @@ -# $Id: e-smith-proxy.spec,v 1.7 2020/12/01 16:03:46 michel Exp $ +# $Id: e-smith-proxy.spec,v 1.8 2020/12/11 20:35:23 michel Exp $ Summary: e-smith server and gateway - proxy module %define name e-smith-proxy Name: %{name} %define version 5.6.0 -%define release 8 +%define release 9 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -16,6 +16,8 @@ Patch2: e-smith-proxy-5.6.0.bz79.redirec 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 + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base @@ -32,6 +34,9 @@ AutoReqProv: no e-smith server and gateway software - proxy module. %changelog +* Tue Mar 16 2021 Jean-Philippe Pialasse 5.6.0-9.sme +- cleanup in /etc/rc.d and /var/service/squid [SME: 9692] + * Thu Dec 10 2020 Michel Begue 2.6.0-8.sme - fix actions for e-smith-proxy-update event [SME: 11116] - add intercept for squid [SME: 9419] @@ -729,6 +734,7 @@ e-smith server and gateway software - pr %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 rm -rf root/var/service/squid/ mkdir -p root/usr/lib/systemd/system/squid.service.d @@ -755,5 +761,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)