--- rpms/smeserver-tw-logonscript/contribs9/smeserver-tw-logonscript.spec	2015/09/08 14:19:07	1.1
+++ rpms/smeserver-tw-logonscript/contribs9/smeserver-tw-logonscript.spec	2015/09/08 14:28:32	1.2
@@ -1,10 +1,10 @@
-# $Id: smeserver-tw-logonscript.spec,v 1.2 2013/07/15 00:05:24 unnilennium Exp $
+# $Id: smeserver-tw-logonscript.spec,v 1.1 2015/09/08 14:19:07 stephdl Exp $
 # Authority: chriscosta
 # Name: Christian Costa
 
 %define name smeserver-tw-logonscript
 %define version 1.5
-%define release 1
+%define release 2
 Summary: TechnologyWise Windows/Linux logon script for Samba
 Name: %{name}
 Version: %{version}
@@ -40,8 +40,8 @@ rm -rf %{name}
 %defattr(-,root,root)
 
 %changelog
-* Tue Sep 08 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.5-1.sme
-- Initial release to contribs9
+* Tue Sep 08 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.5-2.sme
+- Initial release to contribs9 [SME: 9047]
 
 * Sun Jul 14 2013 JP Pialasse <tests@pialasse.com> 1.3-21.sme
 - apply locale 2013-07-14 patch
@@ -97,76 +97,29 @@ rm -rf %{name}
 * 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 Sep 08 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.5-1.sme
-- Initial release to contribs9
-
 
 * 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