--- rpms/smeserver-tw-logonscript/contribs7/smeserver-tw-logonscript.spec	2010/01/27 03:42:49	1.13
+++ rpms/smeserver-tw-logonscript/contribs7/smeserver-tw-logonscript.spec	2010/01/27 20:47:42	1.14
@@ -1,10 +1,10 @@
-# $Id: smeserver-tw-logonscript.spec,v 1.12 2009/12/01 02:24:41 chriscosta Exp $
+# $Id: smeserver-tw-logonscript.spec,v 1.13 2010/01/27 03:42:49 chriscosta Exp $
 # Authority: chriscosta
 # Name: Christian Costa
 
 %define name smeserver-tw-logonscript
 %define version 1.3
-%define release 14
+%define release 15
 Summary: TechnologyWise Windows/Linux logon script for Samba
 Name: %{name}
 Version: %{version}
@@ -22,6 +22,10 @@ Patch8: smeserver-tw-logonscript-1.3-Tem
 Patch9: smeserver-tw-logonscript-1.3-signalEventPatch.patch
 Patch10: smeserver-tw-logonscript-1.3-signalEventPatch2.patch
 Patch11: smeserver-tw-logonscript-1.3-pathDBSettings.patch
+Patch12: smeserver-tw-logonscript-1.3-newDBproperty1.patch
+Patch13: smeserver-tw-logonscript-1.3-newDBproperty2.patch
+Patch14: smeserver-tw-logonscript-1.3-newDBproperty3.patch
+Patch15: smeserver-tw-logonscript-1.3-dbNameChange.patch
 License: GNU GPL version 2
 Group: Networking/Daemons
 BuildArchitectures: noarch
@@ -45,6 +49,11 @@ TechnologyWise Windows/Linux logon scrip
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+
 %build
 perl createlinks
 
@@ -59,28 +68,15 @@ rm -f %{name}-%{version}-filelist
 cd ..
 rm -rf %{name}
 
-
-%pre
-UPDATE=$(/sbin/e-smith/db configuration get tw-logonscript)
-
-case $UPDATE in 
-    0)
-         echo "tw-logonscript configuration db found, not touching anything"
-    ;;
-
-    1)
-         /sbin/e-smith/db configuration set tw-logonscript configuration
-         /sbin/e-smith/db configuration setprop tw-logonscript MountPointsPath /mnt UserHomeMountPointName user_data
-    ;;
-esac 
-
-%preun
-    /sbin/e-smith/db configuration delete tw-logonscript
-
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
 
 %changelog
+* Thu Jan 28 2010 Christian Costa <christian@tw.co.nz> 1.3-15
+- Removed %pre %preun from spec file
+- Added new files under etc/e-smith/db/configuration/defaults/twlogonscript/
+- Change to the main script so that it will comply with the new db name
+
 * Wed Jan 27 2010 Christian Costa <christian@tw.co.nz> 1.3-14
 - Created a new configuration database for tw-logonscript. Two properties MountPointsPath and UserHomeMountPointName have been added.
 - Changed the spec file to set the default properties automatically