--- rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec	2012/02/13 20:51:40	1.65
+++ rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec	2012/04/22 15:51:00	1.73
@@ -1,4 +1,4 @@
-# $Id: smeserver-shared-folders.spec,v 1.64 2011/12/15 15:14:13 vip-ire Exp $
+# $Id: smeserver-shared-folders.spec,v 1.72 2012/03/20 15:39:06 slords 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 62
+%define release 70
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -89,6 +89,16 @@ Patch72: smeserver-shared-folders-0.1-se
 Patch73: smeserver-shared-folders-0.1-fix_ajaxplorer_field_display.patch
 Patch74: smeserver-shared-folders-0.1-hide_trash_if_disabled.patch
 Patch75: smeserver-shared-folders-0.1-users_acl.patch
+Patch76: smeserver-shared-folders-0.1-fixe_users_locale.patch
+Patch77: smeserver-shared-folders-0.1-http_remove_ro_from_rw.patch
+Patch78: smeserver-shared-folders-0.1-http_template_cleanup.patch
+Patch79: smeserver-shared-folders-0.1-fix_root_users_acl.patch
+Patch80: smeserver-shared-folders-0.1-locale-2012-02-18.patch
+Patch81: smeserver-shared-folders-0.1-rsyncd.patch
+Patch82: smeserver-shared-folders-0.1-webdav_access_when_no_auth_required.patch
+Patch83: smeserver-shared-folders-0.1-locale-2012-03-20.patch
+Patch84: smeserver-shared-folders-0.1-mod_perm_after_create.patch
+Patch85: smeserver-shared-folders-0.1-name_and_desc_on_perm_form.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -107,6 +117,34 @@ This module allows you to create network
 with more flexibility than ibays as it supports ACLs
 
 %changelog
+* Fri Apr 20 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1-70.sme
+- Display permission form after creation
+- Display share name and desc in permission form
+
+* Tue Mar 20 2012 SME Translation Server <translations@contribs.org> 0.1-69.el6
+- apply locale 2012-03-20 patch
+
+* Sun Mar 11 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1-68.sme
+- Enable webdav even when no auth is required
+  (but auth will still be required for write operations)
+
+* Thu Mar 01 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1-67.sme
+- Add rsyncd support
+
+* Sat Feb 18 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1-66.sme
+- Fix bg locale
+
+* Sat Feb 18 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1-65.sme
+- Fix root ACL for users
+- Apply locale 2012-02-18 patch
+
+* Sat Feb 18 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1-64.sme
+- In http access, remove ro users from rw list
+- templates cleanup
+
+* Fri Feb 17 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1-63.sme
+- Replace fr with correct en-us locale for USERS entry
+
 * Mon Feb 13 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1-62.sme
 - Code cleanup
 - Move ACL configuration in a separated page
@@ -410,8 +448,21 @@ with more flexibility than ibays as it s
 %patch73 -p1
 %patch74 -p1
 %patch75 -p1
+%patch76 -p1
+%patch77 -p1
+%patch78 -p1
+%patch79 -p1
+%patch80 -p1
+%patch81 -p1
+%patch82 -p1
+%patch83 -p1
+%patch84 -p1
+%patch85 -p1
 
 %pre
+/usr/sbin/useradd -c "Rsyncd User" \
+        -s /sbin/nologin -r -d /dev/null rsync 2> /dev/null || :
+
 %post
 
 %build
@@ -419,6 +470,7 @@ with more flexibility than ibays as it s
 mkdir -p root/etc/e-smith/web/{common,functions}
 mkdir -p root/etc/e-smith/web/panels/manager/{cgi-bin,common,html}
 mkdir -p root/home/e-smith/files/shares
+mkdir -p root/var/log/rsyncd
 
 perl createlinks
 
@@ -428,6 +480,9 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
     --file /etc/cron.daily/purge-shares-recycle 'attr(0755,root,root)' \
     --file /etc/sysconfig/modules/fuse.modules 'attr(0755,root,root)' \
+    --file /var/service/rsyncd/run 'attr(0755,root,root)' \
+    --file /var/service/rsyncd/log/run 'attr(0755,root,root)' \
+    --dir /var/log/rsyncd 'attr(0770,root,smelog)' \
     > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING"          >> %{name}-%{version}-%{release}-filelist