--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/03/17 17:39:47	1.33
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/09/23 16:21:00	1.40
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.32 2010/03/17 17:35:11 snetram Exp $
+# $Id: e-smith-samba.spec,v 1.39 2010/09/23 15:39:18 vip-ire Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
 %define version 2.2.0
-%define release 13
+%define release 20
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -20,6 +20,12 @@ Patch7: e-smith-samba-2.2.0-profilev2.pa
 Patch8: e-smith-samba-2.2.0-refactor-profilev2.patch
 Patch9: e-smith-samba-2.2.0-quote-manually.patch
 Patch10: e-smith-samba-2.2.0-fail-silently-on-non-existent-folder.patch
+Patch11: e-smith-samba-2.2.0-tdb_backup.patch
+Patch12: e-smith-samba-2.2.0-private_dir.patch
+Patch13: e-smith-samba-2.2.0-backup-all-tdb-files.patch
+Patch14: e-smith-samba-2.2.0-strongkey.patch
+Patch15: e-smith-samba-2.2.0-slapd_support.patch
+Patch16: e-smith-samba-2.2.0-lanman_password_as_an_option.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -27,13 +33,41 @@ BuildRequires: e-smith-devtools >= 1.13.
 Obsoletes: e-smith-regedit
 Requires: e-smith-lib >= 2.2.0-2
 Requires: e-smith-formmagick >= 1.4.0-9
-Requires: samba >= 3.0.25b
-Requires: samba-client >= 3.0.25b
-Requires: samba-common >= 3.0.25b
+Requires: samba3x >= 3.3.8
+Requires: samba3x-client >= 3.3.8
+Requires: samba3x-common >= 3.3.8
+Obsoletes: samba <= 3.1.0
+Obsoletes: samba-client <= 3.1.0
+Obsoletes: samba-common <= 3.1.0
+Obsoletes: samba = 3.4.3-1.1.el5.sme
+Obsoletes: samba-client = 3.4.3-1.1.el5.sme
+Obsoletes: samba-common = 3.4.3-1.1.el5.sme
 Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
+* Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-20.sme
+- povide an option to enable lanman passwords [SME: 6229]
+
+* Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-19.sme
+- Add slapd support [SME: 6228]
+
+* Wed Jul 08 2010 Shad L. Lords <slords@mail.com> 2.2.0-18.sme
+- Remove require strong key part of regedit file [SME: 6119]
+
+* Wed Jun 23 2010 Shad L. Lords <slords@mail.com> 2.2.0-17.sme
+- Use samba3x package for windows 7 compatibility [SME: 5964]
+
+* Mon Jun 14 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 2.2.0-16.sme
+- Backup all the tdb files (thanks Daniel) [SME: 5856]
+- Post scriptlet fix [SME: 6057]
+
+* Tue Mar 30 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-15.sme
+- Explicitly declare samba private dir [SME: 5857]
+
+* Fri Mar 26 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-14.sme
+- Fix tdb file paths to backup in run script [SME: 5856]
+
 * Wed Mar 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-13.sme
 - Add dependency /usr/bin/tdbbackup [SME: 5851]
 
@@ -1045,6 +1079,12 @@ Configuration files and templates for th
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -1126,6 +1166,8 @@ then
    /bin/chown admin.root /etc/samba/smbpasswd
 fi
 chown -R smelog.smelog /var/log/{smbd,nmbd}
+# Move back secrets.tdb to private dir
+[ -f /var/lib/samba/private/secrets.tdb ] && mv -f /var/lib/samba/private/secrets.tdb /etc/samba || :
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)