--- rpms/smeserver-tw-logonscript/contribs7/smeserver-tw-logonscript.spec	2009/11/19 03:18:50	1.10
+++ rpms/smeserver-tw-logonscript/contribs7/smeserver-tw-logonscript.spec	2010/01/27 03:42:49	1.13
@@ -1,10 +1,10 @@
-# $Id: smeserver-tw-logonscript.spec,v 1.9 2009/11/16 01:19:46 chriscosta Exp $
+# $Id: smeserver-tw-logonscript.spec,v 1.12 2009/12/01 02:24:41 chriscosta Exp $
 # Authority: chriscosta
 # Name: Christian Costa
 
 %define name smeserver-tw-logonscript
 %define version 1.3
-%define release 11
+%define release 14
 Summary: TechnologyWise Windows/Linux logon script for Samba
 Name: %{name}
 Version: %{version}
@@ -19,6 +19,9 @@ Patch5: smeserver-tw-logonscript-1.3-en_
 Patch6: smeserver-tw-logonscript-1.3-functionsPrintGroupTable.patch
 Patch7: smeserver-tw-logonscript-1.3-panelPrintGroupTable.patch
 Patch8: smeserver-tw-logonscript-1.3-TemplateWarningFix.patch
+Patch9: smeserver-tw-logonscript-1.3-signalEventPatch.patch
+Patch10: smeserver-tw-logonscript-1.3-signalEventPatch2.patch
+Patch11: smeserver-tw-logonscript-1.3-pathDBSettings.patch
 License: GNU GPL version 2
 Group: Networking/Daemons
 BuildArchitectures: noarch
@@ -39,6 +42,9 @@ TechnologyWise Windows/Linux logon scrip
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 %build
 perl createlinks
 
@@ -53,10 +59,38 @@ 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
+* 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
+
+* Tue Dec 1 2009 Christian Costa <christian@tw.co.nz> 1.3-13
+- Changed event name on createlinks to bootstrap-console-save instead of post-upgrade.
+
+* Tue Dec 1 2009 Christian Costa <christian@tw.co.nz> 1.3-12
+- Changed the createlinks script to correctly set up the templates to expand so that netlogon.bat will be expanded with workgroup-update and post-upgrade
+
 * Thu Nov 19 2009 Christian Costa <christian@tw.co.nz> 1.3-11
 - Changes to the netlogon.bat template. If no drive letters were associate to I-bays it generated errors. Also defaulted the home drive to H: in case none is set.
 - Added two missing files to the workgroup-update and post-upgrade events.