[zarafa] - Upgrade to 7.1.7 (#1008068) - Added dependency from gateway and spooler to python-MAPI - Added req

[Robert Scheck]

commit 310ac542a5c8e9b18be79fc73d34446a15cf0089
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Dec 8 17:34:22 2013 +0100

    - Upgrade to 7.1.7 (#1008068)
    - Added dependency from gateway and spooler to python-MAPI
    - Added requirements to virtual libvmime ABI/API provides

 sources                        |    2 +-
 zarafa-7.1.4-libvmime092.patch |  349 ----------------------------------------
 zarafa-webaccess.conf          |    1 +
 zarafa.spec                    |   26 ++--
 4 files changed, 18 insertions(+), 360 deletions(-)
---
diff --git a/sources b/sources
index eaa0ff7..002cfd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38b77a85939e6f1cdc19d099d3cbb9d6  zcp-7.1.5.tar.gz
+7a47d6cfd35c6d2963a10b1920f08577  zcp-7.1.7.tar.gz
diff --git a/zarafa-webaccess.conf b/zarafa-webaccess.conf
index 5c87ea0..e2b702a 100644
--- a/zarafa-webaccess.conf
+++ b/zarafa-webaccess.conf
@@ -16,6 +16,7 @@ Alias /webaccess /usr/share/zarafa-webaccess/
         Require all granted
     </IfModule>
     <IfModule !mod_authz_core.c>
+        # Apache 2.2
         Order allow,deny
         Allow from all
     </IfModule>
diff --git a/zarafa.spec b/zarafa.spec
index 1f4c063..964dfc5 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -1,6 +1,6 @@
 %global beta_or_rc      0
 %global actual_release  1
-%global svnrevision     42059
+%global svnrevision     42779
 %global with_search     1
 %global with_ldap       1
 %global with_xmlto      1
@@ -19,7 +19,7 @@
 
 Summary:            Open Source Edition of the Zarafa Collaboration Platform
 Name:               zarafa
-Version:            7.1.5
+Version:            7.1.7
 %if %{beta_or_rc}
 Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}
 %else
@@ -45,7 +45,6 @@ Source3:            %{name}-webaccess.conf
 Patch0:             zarafa-7.0.9-rpath.patch
 Patch1:             zarafa-7.0.8-va_list.patch
 Patch2:             zarafa-7.1.4-swig20.patch
-Patch3:             zarafa-7.1.4-libvmime092.patch
 
 BuildRequires:      bison
 BuildRequires:      gcc-c++
@@ -53,7 +52,7 @@ BuildRequires:      byacc
 BuildRequires:      flex
 BuildRequires:      gettext
 BuildRequires:      libical-devel >= 0.42
-BuildRequires:      libvmime-devel >= 0.9.0
+BuildRequires:      libvmime-devel >= 0.9.0, libvmime(api) <= 20120406
 BuildRequires:      libxml2-devel
 BuildRequires:      mysql-devel >= 4.1
 BuildRequires:      ncurses-devel
@@ -68,9 +67,6 @@ BuildRequires:      boost-devel >= 1.35.0
 BuildRequires:      boost141-devel
 %endif
 BuildRequires:      swig
-%if 0
-BuildRequires:      %{_bindir}/xsubpp
-%endif
 BuildRequires:      python-devel >= 2.4
 
 %if %{with_search}
@@ -192,6 +188,7 @@ objects, provides a MAPI client library and a C++ programming interface.
 Summary:            POP3/IMAP Gateway for the Zarafa Collaboration Platform
 Group:              System Environment/Daemons
 Requires:           zarafa-common = %{version}-%{release}
+Requires:           python-MAPI%{?_isa} = %{version}-%{release}
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/service, /sbin/chkconfig
 Requires(postun):   /sbin/service
@@ -273,6 +270,7 @@ or can be setup with a separate list of users.
 Summary:            Mail Spooler for the Zarafa Collaboration Platform
 Group:              System Environment/Daemons
 Requires:           zarafa-common = %{version}-%{release}
+Requires:           python-MAPI%{?_isa} = %{version}-%{release}
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/service, /sbin/chkconfig
 Requires(postun):   /sbin/service
@@ -318,6 +316,7 @@ technology to give a more interactive feeling to the users.
 Summary:            MAPI implementation and library by Zarafa
 Group:              System Environment/Libraries
 Requires:           zarafa-client%{?_isa} = %{version}-%{release}
+Requires:           libvmime(abi) <= 20120406
 Requires(post):     /sbin/ldconfig
 Requires(postun):   /sbin/ldconfig
 
@@ -365,7 +364,6 @@ to interact with Zarafa.
 touch -c -r aclocal.m4.rpath aclocal.m4
 %patch1 -p1 -b .va_list
 %patch2 -p1 -b .swig20
-%patch3 -p1 -b .libvmime092
 
 %build
 %if 0%{?rhel}%{?fedora} < 6
@@ -414,7 +412,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-{acl{set,sync},restore}}.*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{zarafa-{backup,restore,report,msr,msr-verify,ldapms.cfg,{licensed,ws}{,.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
@@ -517,6 +515,9 @@ mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php{.new,}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/client/widgets/swfupload/
 %endif
 
+# Remove files only required by proprietary web services
+rm -rf $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/ws.cfg,%{_datadir}/zarafa/timezones}
+
 %find_lang %{name}
 
 %clean
@@ -879,6 +880,11 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Sun Dec 08 2013 Robert Scheck <robert at fedoraproject.org> 7.1.7-1
+- Upgrade to 7.1.7 (#1008068)
+- Added dependency from gateway and spooler to python-MAPI
+- Added requirements to virtual libvmime ABI/API provides
+
 * Mon Aug 05 2013 Robert Scheck <robert at fedoraproject.org> 7.1.5-1
 - Upgrade to 7.1.5 (#747241, #863498, #926039, #946900)
 - Added configuration compatibility for Apache 2.2 and 2.4
@@ -886,7 +892,7 @@ fi
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
-* Sat Jul 27 2013 pmachata at redhat.com - 7.1.4-2
+* Sat Jul 27 2013 Petr Machata <pmachata at redhat.com> - 7.1.4-2
 - Rebuild for boost 1.54.0
 
 * Sat May 25 2013 Rex Dieter <rdieter at fedoraproject.org> 7.1.4-2