--- rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec	2010/03/15 09:08:11	1.20
+++ rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec	2010/11/26 09:57:09	1.28
@@ -1,4 +1,4 @@
-# $Id: smeserver-shared-folders.spec,v 1.19 2010/03/08 13:19:13 vip-ire Exp $
+# $Id: smeserver-shared-folders.spec,v 1.27 2010/11/26 09:56:37 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -6,7 +6,7 @@ Summary: sme server shared folders modul
 %define name smeserver-shared-folders
 Name: %{name}
 %define version 0.1
-%define release 18
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -40,7 +40,16 @@ Patch23: smeserver-shared-folders-0.1-lo
 Patch24: smeserver-shared-folders-0.1-locale-2010-03-02.patch
 Patch25: smeserver-shared-folders-0.1-manual_permissions.patch
 Patch26: smeserver-shared-folders-0.1-dynamic_exec_cgi.patch
-
+Patch27: smeserver-shared-folders-0.1-locale-2010-03-25.patch
+Patch28: smeserver-shared-folders-0.1-locale-2010-03-26.patch
+Patch29: smeserver-shared-folders-0.1-locale-2010-05-23.patch
+Patch30: smeserver-shared-folders-0.1-en-us_typo.patch
+Patch31: smeserver-shared-folders-0.1-locale-2010-07-05.patch
+Patch32: smeserver-shared-folders-0.1-locale-2010-07-19.patch
+Patch33: smeserver-shared-folders-0.1-fix_permissions_on_group_delete.patch
+Patch34: smeserver-shared-folders-0.1-locale-2010-10-20.patch
+Patch35: smeserver-shared-folders-0.1-fix_exclude_separator.patch
+Patch36: smeserver-shared-folders-0.1-enhance_recylce_bin.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -58,6 +67,32 @@ This module allows you to create network
 with more flexibility than ibays as it supports ACLs
 
 %changelog
+* Thu Nov 25 2010 Daniel B. <daniel@firewall-services.com> 0.1-25.sme
+- Fix excludes separator for samba recyle bin [SME: 6379]
+- Recycle bin directory can be configured (RecycleBinDir prop)
+- Create the recyle bin directory if enabled
+- Fix defaults ACL on dir (fix issues with recycle bin)
+
+* Wed Oct 20 2010 Daniel B. <daniel@firewall-services.com> 0.1-24.sme
+- Fix permission on group delete
+- apply local 2010-10-20 patch
+
+* Mon Jul 19 2010 Daniel B. <daniel@firewall-services.com> 0.1-23.sme
+- apply locale 2010-07-19 patch
+
+* Tue Jul 06 2010 Daniel B. <daniel@firewall-services.com> 0.1-22.sme
+- correct typos in en-us locale [SME: 6103]
+- apply locale 2010-07-06 patch
+
+* Sun May 23 2010 SME Translation Server <translations@contribs.org> 0.1-21.sme
+- apply locale 2010-05-23 patch
+
+* Thu Mar 26 2010 Daniel B. <daniel@firewall-services.com> 0.1-20.sme
+- apply locale 2010-03-26 patch (fix navigation-conf)
+
+* Thu Mar 25 2010 Daniel B. <daniel@firewall-services.com> 0.1-19.sme
+- apply locale 2010-03-25 patch
+
 * Mon Mar 15 2010 Daniel B. <daniel@firewall-services.com> 0.1-18.sme
 - really apply manual_permissions patch
 
@@ -115,7 +150,7 @@ with more flexibility than ibays as it s
 - present the keepversion option of the recylcebin in the panel
 - changes in db keys
 - remove some descriptions in the panel
-- optimization in share-modiffy to limit the time needed
+- optimization in share-modify to limit the time needed
   to reset permissions
 
 * Tue May 05 2009 Daniel B. <daniel@firewall-services.com> [0.1-1]
@@ -165,6 +200,16 @@ with more flexibility than ibays as it s
 %{__rm} -f root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm.orig
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
 
 %pre
 %post