--- rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec	2011/05/06 15:35:19	1.43
+++ rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec	2011/08/04 10:51:40	1.57
@@ -1,4 +1,4 @@
-# $Id: smeserver-shared-folders.spec,v 1.42 2011/04/27 16:48:20 slords Exp $
+# $Id: smeserver-shared-folders.spec,v 1.56 2011/07/18 11:46:47 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 40
+%define release 54
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -67,6 +67,19 @@ Patch50: smeserver-shared-folders-0.1-ex
 Patch51: smeserver-shared-folders-0.1-fix_recycle_purge_script.patch
 Patch52: smeserver-shared-folders-0.1-locale-2011-04-27.patch
 Patch53: smeserver-shared-folders-0.1-encfs.patch
+Patch54: smeserver-shared-folders-0.1-locale-2011-05-16.patch
+Patch55: smeserver-shared-folders-0.1-add_missing_inactivity_entry.patch
+Patch56: smeserver-shared-folders-0.1-locale-2011-05-17.patch
+Patch57: smeserver-shared-folders-0.1-dont_check_pass_if_enc_is_off.patch
+Patch58: smeserver-shared-folders-0.1-ro_on_top_dir.patch
+Patch59: smeserver-shared-folders-0.1-add_ajaxplorer_support.patch
+Patch60: smeserver-shared-folders-0.1-samba_audit.patch
+Patch61: smeserver-shared-folders-0.1-make_encfs_optional.patch
+Patch62: smeserver-shared-folders-0.1-locale-2011-07-05.patch
+Patch63: smeserver-shared-folders-0.1-fix_unencrypted_shares_modify.patch
+Patch64: smeserver-shared-folders-0.1-fix_when_ajaxplorer_is_not_installed.patch
+Patch65: smeserver-shared-folders-0.1-fix_encrypted_share_list.patch
+Patch66: smeserver-shared-folders-0.1-dont_check_passwd_if_encrypt_disabled.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -75,7 +88,6 @@ Requires: perl(CGI::FormMagick)
 Requires: e-smith-formmagick >= 1.4.0-12
 Requires: smeserver-mod_dav
 Requires: acl
-Requires: fuse-encfs
 
 BuildRequires: perl
 BuildRequires: e-smith-devtools >= 1.11.0-03
@@ -86,6 +98,51 @@ This module allows you to create network
 with more flexibility than ibays as it supports ACLs
 
 %changelog
+* Thu Aug 04 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-54.sme
+- Don't check password length when encryption is disabled
+
+* Mon Jul 18 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-53.sme
+- Fix encrypted share list
+
+* Wed Jul 13 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-52.sme
+- Fix panel when ajaxplorer is not installed
+
+* Fri Jul 08 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-51.sme
+- Fix modification of unencrypted shares
+
+* Tue Jul 05 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-50.sme
+- Apply locale 2011-07-05 patch
+
+* Tue Jul 05 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-49.sme
+- Make encryption support optional
+- Sanitize password field in userpanelEncfs
+- Prevent deletion of mounted, encrypted shares
+
+* Wed Jun 29 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-48.sme
+- Enable samba auditing
+
+* Tue Jun 28 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-47.sme
+- Fix Ajaxplorer fields on share creation
+
+* Tue Jun 28 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-46.sme
+- Change the way ajaxplorer is integrated (add a new config section)
+
+* Mon Jun 27 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-45.sme
+- Add support for ajaxplorer
+
+* Wed Jun 22 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-44.sme
+- Set read only permissions on top dir of each share
+
+* Tue Jun 14 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-43.sme
+- Don't check password field if encryption is disabled
+
+* Tue May 17 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-42.sme
+- Add missing INACTIVITY entry in locale
+- Apply locale 2011-05-17 patch
+
+* Mon May 16 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-41.sme
+- apply locale 2011-05-16 patch
+
 * Fri May 06 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-40.sme
 - Support encryption using EncFS
 
@@ -294,6 +351,19 @@ with more flexibility than ibays as it s
 %patch51 -p1
 %patch52 -p1
 %patch53 -p1
+%patch54 -p1
+%patch55 -p1
+%patch56 -p1
+%patch57 -p1
+%patch58 -p1
+%patch59 -p1
+%patch60 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
+%patch66 -p1
 
 %pre
 %post