--- rpms/e-smith-lib/sme10/e-smith-lib.spec	2022/11/23 22:07:12	1.18
+++ rpms/e-smith-lib/sme10/e-smith-lib.spec	2023/06/28 08:24:32	1.19
@@ -1,4 +1,4 @@
-# $Id: e-smith-lib.spec,v 1.17 2021/10/28 04:13:03 jpp Exp $
+# $Id: e-smith-lib.spec,v 1.18 2022/11/23 22:07:12 jpp Exp $
 
 %define copykooz 2013-2021
 
@@ -6,7 +6,7 @@ Summary: e-smith server and gateway - li
 %define name e-smith-lib
 Name: %{name}
 %define version 2.6.0
-%define release 16
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -29,7 +29,6 @@ BuildArchitectures: noarch
 BuildRequires: e-smith-devtools >= 1.6.3-01
 Obsoletes: %{name}-Tai64n
 Obsoletes: whiptail
-Requires(pre): e-smith
 Requires: dialog
 Requires: perl, perl(Text::Template)
 Requires: perl(Time::HiRes), perl(MIME::Base64)
@@ -43,6 +42,9 @@ Requires: pciutils
 e-smith server and gateway software - library module.
 
 %changelog
+* Wed Jun 28 2023 Trevor Batley <trevor@batley.id.au> 2.6.0-17.sme
+- add in user and group adds from e-smith package [SME: 12369]
+
 * Wed Nov 23 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-16.sme
 - allow call to systemctl aliases in etc [SME: 12194]
   fix network=>networking service is not restarted.
@@ -889,7 +891,36 @@ mkdir root/etc/e-smith/events/e-smith-li
 %patch10 -p1
 
 %pre
-
+#--------------------------------------------------
+# add admin, public and www user accounts
+#--------------------------------------------------
+/usr/sbin/groupadd \
+  -g 500 shared 2>/dev/null || :
+/usr/sbin/groupadd \
+  -g 102 -o www 2>/dev/null || :
+/usr/sbin/useradd \
+  -u 102 -g 102 -o -c 'SME Server web server' -d /home/e-smith \
+  -G shared -M -s /bin/false www  || :
+/usr/sbin/groupadd \
+  -g 102 -o apache 2>/dev/null || :
+/usr/sbin/useradd \
+  -u 102 -g 102 -o -c 'Apache' -d /var/www \
+  -M -s /sbin/nologin apache  || :
+/usr/sbin/groupadd \
+  -g 101 -o admin 2>/dev/null || :
+/usr/sbin/useradd \
+  -u 101 -g 101 -c 'SME Server administrator' -d /home/e-smith \
+  -G shared,root,www -M -s /sbin/e-smith/console admin  || :
+/usr/sbin/groupadd \
+  -g 103 -o public 2>/dev/null || :
+/usr/sbin/useradd \
+  -u 103 -g 103 -c 'SME Server guest' -d /home/e-smith \
+  -G shared -M -s /bin/false public  || :
+/usr/sbin/groupadd \
+  -g 1002 -o smelog 2>/dev/null || :
+/usr/sbin/useradd \
+  -u 1002 -g 1002 -c 'SME Server log user' -d /var/log/smelog \
+  -M -s /bin/false smelog  || :
 
 %post