--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2009/06/02 13:58:27	1.22
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/06/14 15:15:07	1.36
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.21 2008/11/24 02:32:18 slords Exp $
+# $Id: e-smith-samba.spec,v 1.35 2010/03/30 11:29:43 filippocarletti Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
 %define version 2.2.0
-%define release 5
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,16 @@ Source: %{name}-%{version}.tar.gz
 Patch1: e-smith-samba-2.2.0-sambaRole.patch
 Patch2: e-smith-samba-2.2.0-migratefix.patch
 Patch3: e-smith-samba-2.2.0-fixwarnings.patch
+Patch4: e-smith-samba-2.2.0-win7samba.patch
+Patch5: e-smith-samba-2.2.0-recylebin_perms.patch
+Patch6: e-smith-samba-2.2.0-enable-bind-interfaces.patch
+Patch7: e-smith-samba-2.2.0-profilev2.patch
+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
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -20,12 +30,49 @@ 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: samba >= 3.4.3
+Requires: samba-client >= 3.4.3
+Requires: samba-common >= 3.4.3
+Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
+* 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]
+
+* Sat Mar 6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-12.sme
+- Add missing comma in previous patch [SME: 5821]
+- Silently skip non-existent profile folder [SME: 5821]
+
+* Sat Mar 6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-11.sme
+- Properly quote the profile folders manually [SME: 5821]
+
+* Sat Mar 6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-10.sme
+- Rework V2 profile patch to fix error on user-delete event [SME: 5821]
+
+* Sun Feb 7 2010 Shad L. Lords <slords@mail.com> 2.2.0-9.sme
+- Create/remove V2 profile directories [SME: 3666]
+
+* Sun Jan 31 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-8.sme
+- Enable bindinterfaces by default [SME: 3325]
+
+* Sun Jan 31 2010 Stephen Noble <support@dungog.net> 2.2.0-7.sme
+- Set recyle bin permissions [SME: 1734]
+
+* Sat Dec 26 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-6.sme
+- Add registry file to server-resources to allow windows 7 to 
+  join Samba 3.x domains [SME: 5425]
+
 * Tue Jun 2 2009 Shad L. Lords <slords@mail.com> 2.2.0-5.sme
 - Fix warnings in template expansion [SME: 5309]
 
@@ -1004,6 +1051,16 @@ Configuration files and templates for th
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -1085,6 +1142,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)