[zarafa/el4] Upgrade to 6.40.11

[Robert Scheck]

commit fa21ad37fc76d6aabdb7a0ea835c2828eddcf216
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Sep 11 18:58:34 2011 +0200

    Upgrade to 6.40.11

 .gitignore  |    2 +-
 sources     |    2 +-
 zarafa.spec |   33 +++++++++++++++++++++++++++++----
 3 files changed, 31 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b0d53a5..6269c53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-zcp-6.40.10.tar.gz
+zcp-6.40.11.tar.gz
diff --git a/sources b/sources
index 8b08872..bd04a9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81b4ddf654b22de39f1d7434fc535a7f  zcp-6.40.10.tar.gz
+8778600b44b06b9433e71760b84d282a  zcp-6.40.11.tar.gz
diff --git a/zarafa.spec b/zarafa.spec
index 361a473..6273b1e 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -1,6 +1,6 @@
 %global beta_or_rc      0
 %global actual_release  1
-%global svnrevision     28214
+%global svnrevision     28965
 %global with_clucene    1
 %global with_ldap       1
 %global with_xmlto      1
@@ -18,7 +18,7 @@
 
 Summary:            Open Source Edition of the Zarafa Collaboration Platform
 Name:               zarafa
-Version:            6.40.10
+Version:            6.40.11
 %if %{beta_or_rc}
 Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}
 %else
@@ -107,6 +107,17 @@ client library as well as programming interfaces for C++, PHP and Perl. The
 other Zarafa related packages need to be installed to gain all the features
 and benefits of the Zarafa Collaboration Platform (ZCP).
 
+%package archiver
+Summary:            Archive messages to a secondary Zarafa server
+Group:              Applications/Archiving
+Requires:           zarafa-common = %{version}-%{release}
+
+%description archiver
+The zarafa-archiver package includes the Zarafa Archiver to decrease the
+size of a production Zarafa server by copying or moving the messages to
+a secondary Zarafa server. Clients will still be able to open the message
+from the secondary Zarafa server directly.
+
 %package client
 Summary:            The Zarafa Client library
 Group:              System Environment/Libraries
@@ -392,7 +403,7 @@ make \
 
 # Nuke all overlefts from licensed, managed or other proprietary items
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{license,licensed.cfg,report-ca}
-rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{zarafa-{backup,restore,report,msr,ldapms.cfg,licensed{,.cfg},archiver{,.cfg}},za-aclsync}.*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{zarafa-{backup,restore,report,msr,ldapms.cfg,licensed{,.cfg}},za-aclsync}.*
 rm -f $RPM_BUILD_ROOT%{_bindir}/%{name}-msr
 
 # Move all the initscripts to their appropriate place and
@@ -453,7 +464,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{log,lib}/%{name}/
 rm -f $RPM_BUILD_ROOT{%{_libdir}/{,php/modules,php4,%{name}},%{perl_vendorarch}/auto/MAPI,%{python_sitearch}}/*.la
 
 # Remove files that are anyway in %doc or %{_datadir}/%{name}/
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}{,-indexer}/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}{,-archiver,-indexer}/
 
 # Remove unwanted/unused files that shouldn't exist anyway...
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-indexer
@@ -514,6 +525,10 @@ getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name}
 getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "Zarafa Service Account" %{name}
 exit 0
 
+%post archiver
+# Ensure correct log file ownership after upgrade from official packages
+chown %{name}:%{name} %{_localstatedir}/log/%{name}/archiver.* > /dev/null 2>&1 || :
+
 %post dagent
 [ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-dagent
 # Ensure correct log file ownership after upgrade from official packages
@@ -640,6 +655,13 @@ fi
 %files
 %defattr(-,root,root,-)
 
+%files archiver
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-archiver
+%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/archiver.cfg
+%{_mandir}/man1/%{name}-archiver.1*
+%{_mandir}/man5/%{name}-archiver.cfg.5*
+
 %files client -f %{name}.lang
 %defattr(-,root,root,-)
 %{_libdir}/libzarafaclient.so
@@ -841,6 +863,9 @@ fi
 %endif
 
 %changelog
+* Sun Sep 11 2011 Robert Scheck <robert at fedoraproject.org> 6.40.11-1
+- Upgrade to 6.40.11
+
 * Fri Jul 29 2011 Robert Scheck <robert at fedoraproject.org> 6.40.10-1
 - Upgrade to 6.40.10 (#725250, #725909)