--- rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec	2010/11/26 09:56:37	1.27
+++ rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec	2011/01/03 08:41:13	1.37
@@ -1,4 +1,4 @@
-# $Id: smeserver-shared-folders.spec,v 1.26 2010/10/20 11:59:03 vip-ire Exp $
+# $Id: smeserver-shared-folders.spec,v 1.36 2011/01/03 08:30:48 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 25
+%define release 34
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -50,14 +50,26 @@ Patch33: smeserver-shared-folders-0.1-fi
 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
+Patch42: smeserver-shared-folders-0.1-print_group_table_with_manual_perms.patch
+Patch43: smeserver-shared-folders-0.1-update_manual_perms_warning.patch
+Patch44: smeserver-shared-folders-0.1-fix_warning_in_httpd_template.patch
+Patch45: smeserver-shared-folders-0.1-fix_www_access.patch
+Patch46: smeserver-shared-folders-0.1-php_allow_url_fopen.patch
+Patch47: smeserver-shared-folders-0.1-locale-2011-01-03.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
 
@@ -67,11 +79,41 @@ This module allows you to create network
 with more flexibility than ibays as it supports ACLs
 
 %changelog
+* Mon Jan 03 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-34.sme
+- Apply locale 2011-01-03 patch
+
+* Mon Jan 03 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-33.sme
+- New prop PHPAllowUrlFopen
+
+* Wed Dec 15 2010  Daniel Berteaud <daniel@firewall-services.com> 0.1-32.sme
+- Print the group table when ManualPermissions is enabled
+- Fix a warning in httpd.conf templates
+- Use www as group owner of the root dir if httpAccess is enabled
+
+* 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 recylce bin)
+- 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
@@ -197,7 +239,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
@@ -210,6 +251,17 @@ with more flexibility than ibays as it s
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
 
 %pre
 %post
@@ -226,6 +278,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