From 14138b85501af49ac7962d1d0dd4f84e91f4bdc2 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Feb 21 2014 19:55:38 +0000
Subject: Merge remote branch 'origin/master' into el6


---

diff --git a/sources b/sources
index 510a402..20f9f26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-277506397e3240d06203b94a948bd824  zcp-7.1.8.tar.gz
+9fb95c4071bc21364834af951f4e8a10  zcp-7.1.8.tar.gz
diff --git a/zarafa-7.1.8-man-pages.patch b/zarafa-7.1.8-man-pages.patch
new file mode 100644
index 0000000..df4fb75
--- /dev/null
+++ b/zarafa-7.1.8-man-pages.patch
@@ -0,0 +1,30 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for Zarafa <= 7.1.8 which ensures that
+the removed man pages for proprietary Zarafa Web Services are not tried to be installed.
+
+--- zarafa-7.1.8/doc/Makefile.am			2014-02-20 12:02:44.000000000 +0100
++++ zarafa-7.1.8/doc/Makefile.am.man-pages		2014-02-21 08:55:04.000000000 +0100
+@@ -8,7 +8,11 @@
+ 	zarafa-ical.cfg.5 zarafa-server.cfg.5 zarafa-ldap.cfg.5 zarafa-ldapms.cfg.5 zarafa-unix.cfg.5 zarafa-spooler.cfg.5 zarafa-gateway.cfg.5 \
+ 	zarafa-monitor.cfg.5 zarafa-licensed.cfg.5 zarafa-dagent.cfg.5 zarafa-search.cfg.5 zarafa-archiver.1 zarafa-archiver.cfg.5 \
+ 	zarafa-msr.1 zarafa-msr.cfg.5 zarafa-msr-verify.1 za-aclsync.1 za-aclset.1 zarafa-backup.cfg.5 za-restore.1 \
+-	zarafa-set-oof.1 zarafa-mailbox-permissions.1 zarafa-autorespond.1 zarafa-ws.1 zarafa-ws.cfg.5
++	zarafa-set-oof.1 zarafa-mailbox-permissions.1 zarafa-autorespond.1
++
++if ! OSS_ONLY
++allpages += zarafa-ws.1 zarafa-ws.cfg.5
++endif
+ 
+ CLEANFILES = zarafa-cfgchecker.1
+ 
+--- zarafa-7.1.8/doc/Makefile.in			2014-02-20 12:08:17.000000000 +0100
++++ zarafa-7.1.8/doc/Makefile.in.man-pages		2014-02-21 08:57:00.000000000 +0100
+@@ -294,7 +294,8 @@
+ 	zarafa-ical.cfg.5 zarafa-server.cfg.5 zarafa-ldap.cfg.5 zarafa-ldapms.cfg.5 zarafa-unix.cfg.5 zarafa-spooler.cfg.5 zarafa-gateway.cfg.5 \
+ 	zarafa-monitor.cfg.5 zarafa-licensed.cfg.5 zarafa-dagent.cfg.5 zarafa-search.cfg.5 zarafa-archiver.1 zarafa-archiver.cfg.5 \
+ 	zarafa-msr.1 zarafa-msr.cfg.5 zarafa-msr-verify.1 za-aclsync.1 za-aclset.1 zarafa-backup.cfg.5 za-restore.1 \
+-	zarafa-set-oof.1 zarafa-mailbox-permissions.1 zarafa-autorespond.1 zarafa-ws.1 zarafa-ws.cfg.5
++	zarafa-set-oof.1 zarafa-mailbox-permissions.1 zarafa-autorespond.1
++@OSS_ONLY_FALSE@allpages += zarafa-ws.1 zarafa-ws.cfg.5
+ 
+ CLEANFILES = zarafa-cfgchecker.1
+ man_MANS = $(BUILT_SOURCES) $(allpages)
diff --git a/zarafa.spec b/zarafa.spec
index cce0e6f..b77edb5 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -1,6 +1,6 @@
 %global beta_or_rc      0
-%global actual_release  1
-%global svnrevision     43801
+%global actual_release  3
+%global svnrevision     44004
 %global with_search     1
 %global with_ldap       1
 %global with_xmlto      1
@@ -44,6 +44,7 @@ Source3:            %{name}-webaccess.conf
 
 Patch0:             zarafa-7.0.9-rpath.patch
 Patch1:             zarafa-7.1.8-nullptr.patch
+Patch2:             zarafa-7.1.8-man-pages.patch
 
 BuildRequires:      bison
 BuildRequires:      gcc-c++
@@ -362,6 +363,7 @@ to interact with Zarafa.
 %patch0 -p1 -b .rpath
 touch -c -r aclocal.m4.rpath aclocal.m4
 %patch1 -p1 -b .nullptr
+%patch2 -p1 -b .man-pages
 
 %build
 %if 0%{?rhel}%{?fedora} < 6
@@ -884,6 +886,12 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Fri Feb 21 2014 Robert Scheck <robert@fedoraproject.org> 7.1.8-3
+- Upgrade to 7.1.8 (re-released)
+
+* Fri Feb 14 2014 Parag Nemade <paragn AT fedoraproject DOT org> - 7.1.8-2
+- Rebuild for icu 52
+
 * Thu Jan 30 2014 Robert Scheck <robert@fedoraproject.org> 7.1.8-1
 - Upgrade to 7.1.8 (#1056767, #1059903)