--- rpms/smeserver-BackupPC/contribs7/smeserver-BackupPC.spec	2009/03/18 11:46:40	1.4
+++ rpms/smeserver-BackupPC/contribs7/smeserver-BackupPC.spec	2009/05/07 13:29:52	1.7
@@ -1,33 +1,36 @@
-# $Id: smeserver-BackupPC.spec,v 1.3 2009/03/02 22:33:48 vip-ire Exp $
+# $Id: smeserver-BackupPC.spec,v 1.6 2009/05/05 08:37:46 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
-Name:		smeserver-BackupPC
-Version:        0.1
-Release:        5%{?dist}
-Summary:        BackupPC integration into SME server
-
-Group:          Applications/System
-License:        GPL
-URL:            http://backuppc.sourceforge.net/
-Source:        %{name}-%{version}.tar.gz
-Patch0:		smeserver-BackupPC-0.1-logrotate.patch
-Patch1:		smeserver-BackupPC-0.1-config_path.patch
-Patch2: 	smeserver-BackupPC-0.1-post-upgrade_to_bootstrape.patch
-Patch3:		smeserver-BackupPC-0.1-sudoers.patch
-Patch4:         smeserver-BackupPC-0.1-smeserver_template.patch
-Patch5:         smeserver-BackupPC-0.1-fix_logrotate_event.patch
-Patch6:		smeserver-BackupPC-0.1-sudoers_enhancement.patch
-
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}
-BuildArch:      noarch
-
-BuildRequires:	e-smith-devtools
-
-Requires:	mod_auth_tkt
-Requires:	BackupPC >= 3.1.0
-Requires:	smeserver-remoteuseraccess
+Name: smeserver-BackupPC
+Version: 0.1
+Release: 8%{?dist}
+Summary: BackupPC integration into SME server
+
+Group: Applications/System
+License: GPL
+URL: http://backuppc.sourceforge.net/
+Source: %{name}-%{version}.tar.gz
+Patch0:	smeserver-BackupPC-0.1-logrotate.patch
+Patch1:	smeserver-BackupPC-0.1-config_path.patch
+Patch2: smeserver-BackupPC-0.1-post-upgrade_to_bootstrape.patch
+Patch3:	smeserver-BackupPC-0.1-sudoers.patch
+Patch4: smeserver-BackupPC-0.1-smeserver_template.patch
+Patch5: smeserver-BackupPC-0.1-fix_logrotate_event.patch
+Patch6:	smeserver-BackupPC-0.1-sudoers_enhancement.patch
+Patch7: smeserver-BackupPC-0.1-templates_fixes.patch
+Patch8: smeserver-BackupPC-0.1-httpd_conf_cleanup.patch
+Patch9: smeserver-BackupPC-0.1-quotes_share_name.patch
+Patch10: smeserver-BackupPC-0.1-fixe_on_post_upgrade.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildArch: noarch
+
+BuildRequires: e-smith-devtools
+
+Requires: mod_auth_tkt
+Requires: BackupPC >= 3.1.0
+Requires: smeserver-remoteuseraccess
 
 #Conflicts: smeserver-backuppc.fws
 Obsoletes: smeserver-backuppc.fws
@@ -41,6 +44,19 @@ This package contains specific configura
 
 
 %changelog
+* Thu May 07 2009 Daniel B. <daniel@firewall-services.com> [0.1-8]
+- Link backuppc-checkupgrade script in post-upgrade event
+  so the contrib is correctly configured without running backuppc-update
+  event [SME: 5221]
+
+* Tue May 05 2009 Daniel B. <daniel@firewall-services.com> [0.1-7]
+- Fixe permissions on /etc/BackupPC/pc
+
+* Mon Mar 23 2009 Daniel B. <daniel@firewall-services.com> [0.1-6]
+- modify default httpd conf (cleanup) to use the new paths
+- Add quotes in share names for *Archive.conf files
+- Enhance provided template
+
 * Wed Mar 18 2009 Daniel B. <daniel@firewall-services.com> [0.1-5]
 - Enhance sudoers templates
 
@@ -94,6 +110,10 @@ This package contains specific configura
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 
 %build
@@ -125,6 +145,7 @@ perl createlinks
         --file /etc/BackupPC/localCopyPool.conf 'attr(640,backuppc,backuppc) %config(noreplace)' \
         --file /etc/BackupPC/remoteArchive.conf 'attr(640,backuppc,backuppc) %config(noreplace)' \
         --file /etc/BackupPC/remoteCopyPool.conf 'attr(640,backuppc,backuppc) %config(noreplace)' \
+        --dir /etc/BackupPC/pc 'attr(750,backuppc,backuppc)' \
 	--dir /var/service/httpd-bkpc 'attr(01755,root,root)' \
 	--file /var/service/httpd-bkpc/run 'attr(0700,root,root)' \
         --dir /var/service/httpd-bkpc/supervise 'attr(0700,root,root)' \