--- rpms/e-smith/sme9/e-smith.spec	2013/03/06 20:19:43	1.2
+++ rpms/e-smith/sme9/e-smith.spec	2013/05/19 16:03:05	1.6
@@ -1,9 +1,9 @@
-# $Id: e-smith.spec,v 1.1 2013/01/25 17:18:00 slords Exp $
+# $Id: e-smith.spec,v 1.5 2013/05/19 15:55:33 wellsi Exp $
 
 Summary: e-smith server and gateway
 Name: e-smith
 %define version 5.4.0
-%define release 2
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -11,10 +11,20 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 BuildArch: noarch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-Prereq: /usr/sbin/useradd
+Requires(pre): /usr/sbin/useradd
 AutoReqProv: no
 
 %changelog
+* Sun May 19 2013 Ian Wells <esmith@wellsi.com> 5.4.0-5.sme
+- Update the full names of users added in %pre [SME: 3550]
+
+* Sun May 05 2013 Ian Wells <esmith@wellsi.com> 5.4.0-4.sme
+- Fix uid and gid to be the same for the users added in %pre [SME: 7547]
+- Changed Prereq to Requires(pre) as Prereq is deprecated
+
+* Sat Mar 9 2013 Shad L. Lords <slords@mail.com> 5.4.0-3.sme
+- Ensure group www exists before user [SME: 7319]
+
 * Wed Mar 6 2013 Shad L. Lords <slords@mail.com> 5.4.0-2.sme
 - Fix pre script to make www and apache the same [SME: 7319]
 
@@ -88,18 +98,32 @@ can work. Contents are now included in e
 #--------------------------------------------------
 /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 -c 'e-smith web server' -d /home/e-smith \
-  -G shared -M -s /bin/false www 2>/dev/null || :
+  -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 -c 'e-smith administrator' -d /home/e-smith \
-  -G shared,root,www -M -s /sbin/e-smith/console admin 2>/dev/null || :
+  -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 -c 'e-smith guest' -d /home/e-smith \
-  -G shared -M -s /bin/false public 2>/dev/null || :
+  -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 -c 'sme log user' -d /var/log/smelog \
-  -M -s /bin/false smelog 2>/dev/null || :
+  -u 1002 -g 1002 -c 'SME Server log user' -d /var/log/smelog \
+  -M -s /bin/false smelog  || :
+
 
 %clean 
 rm -rf $RPM_BUILD_ROOT