--- rpms/e-smith-lib/sme9/e-smith-lib.spec	2013/05/05 05:53:12	1.9
+++ rpms/e-smith-lib/sme9/e-smith-lib.spec	2013/05/07 15:02:51	1.10
@@ -1,10 +1,10 @@
-# $Id: e-smith-lib.spec,v 1.8 2013/03/09 22:31:57 slords Exp $
+# $Id: e-smith-lib.spec,v 1.9 2013/05/05 05:53:12 wellsi Exp $
 
 Summary: e-smith server and gateway - library module
 %define name e-smith-lib
 Name: %{name}
 %define version 2.4.0
-%define release 7
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -14,11 +14,13 @@ Patch0: e-smith-lib-2.4.0-dont_use_kudzu
 Patch1: e-smith-lib-2.4.0-fix_bonding.patch
 Patch2: e-smith-lib-2.4.0-ipv4check.patch
 Patch3: e-smith-lib-2.4.0-untaint_nic_names.patch
+Patch4: e-smith-lib-2.4.0-CreateSystemUser.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 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)
@@ -31,6 +33,9 @@ Requires: pciutils
 e-smith server and gateway software - library module.
 
 %changelog
+* Sun May 05 2013 Ian Wells <esmith@wellsi.com> 2.4.0-8.sme
+- Add e-smith as a prereq to enable removal of adding users in %pre [SME: 7547]
+
 * Sat Mar 9 2013 Shad L. Lords <slords@mail.com> 2.4.0-7.sme
 - Ensure group www exists before user [SME: 7319]
 
@@ -770,29 +775,10 @@ e-smith server and gateway software - li
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -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 'e-smith web server' -d /home/e-smith \
-  -G shared -M -s /bin/false www 2>/dev/null || :
-/usr/sbin/useradd \
-  -u 101 -c 'e-smith administrator' -d /home/e-smith \
-  -G shared,root,www -M -s /sbin/e-smith/console admin 2>/dev/null || :
-/usr/sbin/useradd \
-  -u 103 -c 'e-smith guest' -d /home/e-smith \
-  -G shared -M -s /bin/false public 2>/dev/null || :
-/usr/sbin/useradd \
-  -u 1002 -c 'sme log user' -d /var/log/smelog \
-  -M -s /bin/false smelog 2>/dev/null || :
 
-exit 0
 
 %post