--- rpms/e-smith-base/sme10/e-smith-base.spec	2021/03/06 06:35:18	1.104
+++ rpms/e-smith-base/sme10/e-smith-base.spec	2021/03/16 16:33:05	1.105
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.103 2021/03/03 20:18:12 jpp Exp $
+# $Id: e-smith-base.spec,v 1.104 2021/03/06 06:35:18 jpp Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.8.0
-%define release 87
+%define release 88
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -72,6 +72,7 @@ Patch58: e-smith-base-5.8.0-bz11356-bz11
 Patch59: e-smith-base-5.8.0-bz11415-dropDyndns.patch
 Patch60: e-smith-base-5.8.0-bz11363-klogd.patch
 Patch61: e-smith-base-5.8.0-bz11374-pptp2vpn.patch
+Patch62: e-smith-base-5.8.0-bz9692-cleanup.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: pwauth
@@ -130,6 +131,9 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.8.0-88.sme
+- cleanup /etc/rc.d and /var/service [SME: 9692]
+
 * Wed Mar 03 2021 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-87.sme
 - remove klogd references [SME: 11363]
 - restore part of pptp code and move to generik vpn entry [SME: 11374]
@@ -2208,6 +2212,12 @@ rm -rf root/etc/e-smith/db/configuration
 rm -rf root/var/service/klogd
 rm -rf root/etc/e-smith/db/configuration/defaults/klogd
 %patch61 -p1
+%patch62 -p1
+rm -rf root/etc/rc6.d
+rm -rf root/etc/rc.d/rc1.d
+rm -rf root/etc/rc.d/rc6.d
+rm -rf root/etc/rc.d/init.d 
+rm -rf root/etc/rc.d/rc1.d
 
 %pre
 /sbin/e-smith/create-system-user smelastsys 2999 \
@@ -2255,27 +2265,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/selinux
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
     --file /sbin/e-smith/systemd/mdmonitor-pre 'attr(0554,root,root)' \
     --file /etc/cron.daily/conf-mod_ssl 'attr(0544,root,root)' \
-    --file /etc/rc.d/rc.e-smith 'attr(0750,root,root)' \
-    --dir /var/service/dhcpd 'attr(01755,root,root)' \
-    --file /var/service/dhcpd/down 'attr(0644,root,root)' \
-    --file /var/service/dhcpd/run 'attr(0755,root,root)' \
-    --dir /var/service/dhcpd/log 'attr(0755,root,root)' \
-    --dir /var/service/dhcpd/log/supervise 'attr(0700,root,root)' \
-    --dir /var/service/dhcpd/supervise 'attr(0700,root,root)' \
-    --file /var/service/dhcpd/log/run 'attr(0755,root,root)' \
     --dir /var/log/dhcpd 'attr(2750,smelog,smelog)' \
-    --dir /var/service/raidmonitor 'attr(01755,root,root)' \
-    --file /var/service/raidmonitor/down 'attr(0644,root,root)' \
-    --file /var/service/raidmonitor/run 'attr(0755,root,root)' \
-    --dir /var/service/raidmonitor/log 'attr(0755,root,root)' \
-    --dir /var/service/raidmonitor/log/supervise 'attr(0700,root,root)' \
-    --dir /var/service/raidmonitor/supervise 'attr(0700,root,root)' \
-    --file /var/service/raidmonitor/log/run 'attr(0755,root,root)' \
-    --dir /var/log/raidmonitor 'attr(2750,smelog,smelog)' \
-    --file /var/service/syslog/run 'attr(0755,root,root)' \
-    --file /var/service/syslog/down 'attr(0644,root,root)' \
-    --file /var/service/klogd/run 'attr(0755,root,root)' \
-    --file /var/service/klogd/down 'attr(0644,root,root)' \
     --dir /etc/e-smith/pam 'attr(0700,root,root)' \
     --dir /home/e-smith/ssl.key 'attr(0700,root,root)' \
     --dir /home/e-smith/ssl.crt 'attr(0700,root,root)' \
@@ -2302,7 +2292,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/selinux
     --dir /var/service/ippp/log/supervise 'attr(0700,root,root)' \
     --dir /var/log/ippp 'attr(2750,smelog,smelog)' \
     --dir /etc/e-smith/skel/user/.ssh 'attr(0700,root,root)' \
-    --file /var/service/local/run 'attr(0750,root,root)' \
     --file /etc/sysconfig/modules/dummy.modules 'attr(0755,root,root)' \
     --dir /etc/selinux 'attr(0755,root,root)' \
     > %{name}-%{version}-%{release}-filelist
@@ -2317,6 +2306,17 @@ do
 done
 echo "%doc COPYING"          >> %{name}-%{version}-%{release}-filelist
 
+%post
+  if [ -d "/var/service/dhcpd" ]; then
+	rm -rf /var/service/dhcpd 
+  fi
+  if [ -d "/var/service/raidmonitor" ]; then
+        rm -rf /var/service/raidmonitor
+  fi
+  if [ -d "/var/service/local" ]; then
+        rm -rf /var/service/local
+  fi
+
 %clean 
 rm -rf $RPM_BUILD_ROOT