--- rpms/smeserver-tw-logonscript/contribs7/smeserver-tw-logonscript.spec	2009/10/16 23:17:44	1.1
+++ rpms/smeserver-tw-logonscript/contribs7/smeserver-tw-logonscript.spec	2009/11/16 01:19:46	1.9
@@ -1,26 +1,42 @@
-# $Id: smeserver-arkeia.spec,v 1.24 2009/08/24 17:58:13 slords Exp $
+# $Id: smeserver-tw-logonscript.spec,v 1.8 2009/11/04 00:42:53 chriscosta Exp $
 # Authority: chriscosta
 # Name: Christian Costa
 
 %define name smeserver-tw-logonscript
 %define version 1.3
-%define release 3%{?dist}
+%define release 10
 Summary: TechnologyWise Windows/Linux logon script for Samba
 Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
 Source: smeserver-tw-logonscript-%{version}.tar.gz
+Patch0: smeserver-tw-logonscript-1.3-removeblank.patch
+Patch1: smeserver-tw-logonscript-1.3-locale-2009-10-21.patch
+Patch2: smeserver-tw-logonscript-1.3-locale-2009-10-27.patch
+Patch3: smeserver-tw-logonscript-1.3-PamMountOptsFix-HomeNameChange.patch
+Patch4: smeserver-tw-logonscript-1.3-SecurityFixBatchEdit.patch
+Patch5: smeserver-tw-logonscript-1.3-en_us_patch1.patch
+Patch6: smeserver-tw-logonscript-1.3-functionsPrintGroupTable.patch
+Patch7: smeserver-tw-logonscript-1.3-panelPrintGroupTable.patch
 License: GNU GPL version 2
-Group: Applications/Backup
+Group: Networking/Daemons
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
+BuildRequires: e-smith-devtools
 
 %description
 TechnologyWise Windows/Linux logon script for Samba
 
 %prep
 %setup
-
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 %build
 perl createlinks
 
@@ -39,19 +55,90 @@ rm -rf %{name}
 %defattr(-,root,root)
 
 %changelog
+* Mon Nov 16 2009 Christian Costa <christian@tw.co.nz> 1.3-10
+- Changes to the SME Server panel. Now it displays a list with all groups that allows custom group batch files to be edited/created for all groups not only the ones associated with i-bays.
+- Added a new lexicon to the en_us file
+
+* Wed Nov 4 2009 Christian Costa <christian@tw.co.nz> 1.3-9
+- Fixed a security problem that would allow the creation of arbitrary files on the system.
+
+* Thu Oct 29 2009 Christian Costa <christian@tw.co.nz> 1.3-8
+- Added additional pam_mount options to the .pam_mount.xml generation routine
+- Changed the user's home dir mount point name from home to win_home
+
+* Tue Oct 27 2009 SME Translation Server <translations@contribs.org> 1.3-7.sme
+- apply locale 2009-10-27 patch
+
+* Wed Oct 21 2009 SME Translation Server <translations@contribs.org> 1.3-6.sme
+- apply locale 2009-10-21 patch
+- cleanup changelog to be more readable
+
+* Tue Oct 20 2009 Christian Costa <christian@tw.co.nz> 1.3-5
+<<<<<<< smeserver-tw-logonscript.spec
+Added e-smith-devtools as a build requirement
+
+=======
+- Added e-smith-devtools as a build requirement
+
+>>>>>>> 1.6
+* Tue Oct 20 2009 Christian Costa <christian@tw.co.nz> 1.3-04
+<<<<<<< smeserver-tw-logonscript.spec
+Removed a blank space from the source code for testing purposes
+
+=======
+- Removed a blank space from the source code for testing purposes
+
+>>>>>>> 1.6
 * Thu Oct 8 2009 Christian Costa <christian@tw.co.nz>
+<<<<<<< smeserver-tw-logonscript.spec
 Added localisation support
 Added server-manager embedded custom group batch file editing
 Fixed a bug with user custom scripts that were being executed more than once
+
+=======
+- Added localisation support
+- Added server-manager embedded custom group batch file editing
+- Fixed a bug with user custom scripts that were being executed more than once
+
+>>>>>>> 1.6
 * Thu Sep 3 2009 Christian Costa <christian@tw.co.nz>
+<<<<<<< smeserver-tw-logonscript.spec
 New specs file, new version number
+
+=======
+- New specs file, new version number
+
+>>>>>>> 1.6
 * Mon Aug 10 2009 Christian Costa <christian@tw.co.nz>
+<<<<<<< smeserver-tw-logonscript.spec
 Branched out from the 61netlogonshare custom script and added a new db property for smb called LogonScript
+
+=======
+- Branched out from the 61netlogonshare custom script and added a new db property for smb called LogonScript
+
+>>>>>>> 1.6
 * Wed Jul 8 2009 Christian Costa <christian@tw.co.nz>
+<<<<<<< smeserver-tw-logonscript.spec
 Added .pam_mount.conf.xml generation for Linux clients using libpam-mount.
+
+=======
+- Added .pam_mount.conf.xml generation for Linux clients using libpam-mount.
+
+>>>>>>> 1.6
 * Wed Jul 29 2008 Christian Costa <christian@tw.co.nz>
+<<<<<<< smeserver-tw-logonscript.spec
 Added a feature that maps the drive if all users are allowed to read an I-bay.
 Extended the drive letter range from F to Z.
+
+=======
+- Added a feature that maps the drive if all users are allowed to read an I-bay.
+- Extended the drive letter range from F to Z.
+
+>>>>>>> 1.6
 * Wed Jul 9 2008 Christian Costa <christian@tw.co.nz>
+<<<<<<< smeserver-tw-logonscript.spec
 Added the server-manager web interface to the package.
+=======
+- Added the server-manager web interface to the package.
 
+>>>>>>> 1.6