[zarafa: 1/2] Upgrade to 7.0.12

[Robert Scheck]

commit 8e0248cdb8a0e1368d09feefdce7a640b3f8de32
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Feb 10 23:13:32 2013 +0100

    Upgrade to 7.0.12

 .gitignore                  |    1 +
 sources                     |    2 +-
 zarafa-7.0.8-zlib127.patch  |   27 -----
 zarafa-7.0.9-boost150.patch |  254 -------------------------------------------
 zarafa.spec                 |   27 ++---
 5 files changed, 14 insertions(+), 297 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 205edf5..ba2b6c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 zcp-7.?.?.tar.gz
+/zcp-7.0.12.tar.gz
diff --git a/sources b/sources
index 5ad1bcb..5714b86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2729d8052e3d63215290005ba708c7ae  zcp-7.0.9.tar.gz
+b09b2882c0d576cb88893290fec9c8f3  zcp-7.0.12.tar.gz
diff --git a/zarafa.spec b/zarafa.spec
index 1fb6c6d..597e517 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -1,6 +1,6 @@
 %global beta_or_rc      0
-%global actual_release  2
-%global svnrevision     36358
+%global actual_release  1
+%global svnrevision     40336
 %global with_clucene    1
 %global with_ldap       1
 %global with_xmlto      1
@@ -19,9 +19,9 @@
 
 Summary:            Open Source Edition of the Zarafa Collaboration Platform
 Name:               zarafa
-Version:            7.0.9
+Version:            7.0.12
 %if %{beta_or_rc}
-Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}.1
+Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}
 %else
 Release:            %{actual_release}%{?dist}
 %endif
@@ -43,9 +43,7 @@ Source2:            %{name}.logrotate
 Source3:            %{name}-webaccess.conf
 
 Patch0:             zarafa-7.0.9-rpath.patch
-Patch1:             zarafa-7.0.8-zlib127.patch
-Patch2:             zarafa-7.0.8-va_list.patch
-Patch3:             zarafa-7.0.9-boost150.patch
+Patch1:             zarafa-7.0.8-va_list.patch
 
 BuildRequires:      bison
 BuildRequires:      gcc-c++
@@ -373,10 +371,7 @@ to interact with Zarafa.
 %setup -q
 %patch0 -p1 -b .rpath
 touch -c -r aclocal.m4.rpath aclocal.m4
-%patch1 -p1 -b .zlib127
-%patch2 -p1 -b .va_list
-%patch3 -p1 -b .boost150
-touch -c -r configure.ac.boost150 configure.ac
+%patch1 -p1 -b .va_list
 
 %build
 %if 0%{?rhel}%{?fedora} < 6
@@ -425,7 +420,7 @@ make \
 
 # Nuke all overlefts from licensed, managed or other proprietary items
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/{%{name}/{license,licensed.cfg,report-ca},cron.daily/%{name}-client-update}
-rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{zarafa-{backup,restore,report,msr,msr-verify,ldapms.cfg,licensed{,.cfg}},za-aclsync}.*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{zarafa-{backup,restore,report,msr,msr-verify,ldapms.cfg,licensed{,.cfg}},za-{acl{set,sync},restore}}.*
 
 # Move all the initscripts to their appropriate place and
 # ensure that all services are off by default at boot time
@@ -521,7 +516,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/{.htaccess,%{name}-webaccess.
 
 # Remove flash-based multi-attachment upload (missing source)
 %if %{no_multiupload}
-sed '131,138d' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php > \
+sed '143,150d' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php > \
     $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php.new
 touch -c -r $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php{,.new}
 mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php{.new,}
@@ -707,6 +702,7 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/autorespond
 %{_sysconfdir}/rc.d/init.d/%{name}-dagent
 %{_mandir}/man1/%{name}-dagent.1*
+%{_mandir}/man1/%{name}-autorespond.1*
 %{_mandir}/man5/%{name}-dagent.cfg.5*
 
 %files devel
@@ -769,8 +765,6 @@ fi
 %{_bindir}/%{name}-monitor
 %config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/monitor.cfg
 %dir %{_sysconfdir}/%{name}/quotamail/
-%config(noreplace) %{_sysconfdir}/%{name}/quotamail/companyhard.mail
-%config(noreplace) %{_sysconfdir}/%{name}/quotamail/companysoft.mail
 %config(noreplace) %{_sysconfdir}/%{name}/quotamail/companywarning.mail
 %config(noreplace) %{_sysconfdir}/%{name}/quotamail/userhard.mail
 %config(noreplace) %{_sysconfdir}/%{name}/quotamail/usersoft.mail
@@ -880,6 +874,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Sun Feb 10 2013 Robert Scheck <robert at fedoraproject.org> 7.0.12-1
+- Upgrade to 7.0.12
+
 * Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 7.0.9-2
 - Rebuild for Boost-1.53.0