--- rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec	2010/10/20 11:59:03	1.26
+++ rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec	2010/12/10 12:53:33	1.34
@@ -1,4 +1,4 @@
-# $Id: smeserver-shared-folders.spec,v 1.25 2010/07/19 08:18:01 vip-ire Exp $
+# $Id: smeserver-shared-folders.spec,v 1.33 2010/12/02 08:40:12 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 24
+%define release 31
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -48,15 +48,22 @@ Patch31: smeserver-shared-folders-0.1-lo
 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
+Patch37: smeserver-shared-folders-0.1-webdav_support.patch
+Patch38: smeserver-shared-folders-0.1-purge_recycle.patch
+Patch39: smeserver-shared-folders-0.1-locale-2010-11-30.patch
+Patch40: smeserver-shared-folders-0.1-fix_purge_script.patch
+Patch41: smeserver-shared-folders-0.1-prop_alias_on_primary.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.13.15-76
 Requires: perl(CGI::FormMagick)
 Requires: e-smith-formmagick >= 1.4.0-12
-
+Requires: smeserver-mod_dav
 Requires: acl
+
 BuildRequires: perl
 BuildRequires: e-smith-devtools >= 1.11.0-03
 
@@ -66,6 +73,31 @@ This module allows you to create network
 with more flexibility than ibays as it supports ACLs
 
 %changelog
+* Fri Dec 10 2010 Daniel Berteaud <daniel@firewall-services.com> 0.1-31.sme
+- Add new prop AliasOnPrimary to toggle alias on the system domain
+
+* Thu Dec 2 2010 Daniel Berteaud <daniel@firewall-services.com> 0.1-30.sme
+- Fix purge script
+
+* Tue Nov 30 2010 Daniel Berteaud <daniel@firewall-services.com> 0.1-29.sme
+- apply locale 2010-11-30 patch
+
+* Tue Nov 30 2010 Shad L. Lords <slords@mail.com> 0.1-28.sme
+- Fix orig file removal the correct way
+
+* Mon Nov 29 2010  Daniel B. <daniel@firewall-services.com> 0.1-27.sme
+- Remove .orig file
+
+* Wed Nov 26 2010 Daniel B. <daniel@firewall-services.com> 0.1-26.sme
+- Add webdav support
+- add recycle purge support (with configurable retention time)
+
+* 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
@@ -190,7 +222,6 @@ with more flexibility than ibays as it s
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%{__rm} -f root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm.orig
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
@@ -201,6 +232,13 @@ with more flexibility than ibays as it s
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
 
 %pre
 %post
@@ -217,6 +255,7 @@ perl createlinks
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+    --file /etc/cron.daily/purge-shares-recycle 'attr(0755,root,root)' \
     > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING"          >> %{name}-%{version}-%{release}-filelist