--- rpms/smeserver-shared-folders/contribs9/smeserver-shared-folders.spec	2013/11/11 19:52:05	1.5
+++ rpms/smeserver-shared-folders/contribs9/smeserver-shared-folders.spec	2014/01/13 15:36:09	1.9
@@ -1,4 +1,4 @@
-# $Id: smeserver-shared-folders.spec,v 1.5 2013/10/29 16:04:59 vip-ire Exp $
+# $Id: smeserver-shared-folders.spec,v 1.8 2013/11/25 11:51:51 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -6,12 +6,15 @@ Summary: sme server shared folders modul
 %define name smeserver-shared-folders
 Name: %{name}
 %define version 0.3
-%define release 1
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
+Patch0: smeserver-shared-folders-0.3-remove_fstab_expand_on_post_upgrade.patch
+Patch1: smeserver-shared-folders-0.3-dump_acl_and_xattr_for_manual_perm.patch
+Patch2: smeserver-shared-folders-0.3-fix_missing_cr_in_smb_template.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -30,7 +33,17 @@ This module allows you to create network
 with more flexibility than ibays as it supports ACLs
 
 %changelog
-* Mon Nov 11 2013 Daniel Berteaud <daniel@firewall-services.com> 0.2-1.sme
+* Mon Jan 13 2014 Daniel Berteaud <daniel@firewall-services.com> 0.3-4.sme
+- Add a missing CR in smb.conf templates
+
+* Mon Nov 25 2013 Daniel Berteaud <daniel@firewall-services.com> 0.3-3.sme
+- Dump ACL and extended attributes in /home/e-smith/db/shares if
+  ManualPermissions is set
+
+* Tue Nov 12 2013 Daniel Berteaud <daniel@firewall-services.com> 0.3-2.sme
+- Remove expand link for fstab in post-upgrade
+
+* Mon Nov 11 2013 Daniel Berteaud <daniel@firewall-services.com> 0.3-1.sme
 - Rebuild for SME9
 
 * Tue Oct 29 2013 Daniel Berteaud <daniel@firewall-services.com> 0.1-83.sme
@@ -329,6 +342,9 @@ with more flexibility than ibays as it s
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %pre
 /usr/sbin/useradd -c "Rsyncd User" \
@@ -342,6 +358,7 @@ mkdir -p root/etc/e-smith/web/{common,fu
 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
+mkdir -p root/home/e-smith/db/shares
 
 perl createlinks
 
@@ -354,6 +371,7 @@ rm -rf $RPM_BUILD_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)' \
+    --dir /home/e-smith/db/shares 'attr(0750,root,root)' \
     > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING"          >> %{name}-%{version}-%{release}-filelist