[zarafa] Upgrade to 7.0.3

[Robert Scheck]

commit e315db38d63957ae50455380f590b89878d4815a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Nov 20 02:11:12 2011 +0100

    Upgrade to 7.0.3

 .gitignore  |    2 +-
 sources     |    2 +-
 zarafa.spec |   24 +++++++++++++++++++++---
 3 files changed, 23 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ad4ea6..48c5bed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-zcp-7.0.2.tar.gz
+zcp-7.0.3.tar.gz
diff --git a/sources b/sources
index 3ba76ec..1491604 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a0604a9b769057941a1e83781134176  zcp-7.0.2.tar.gz
+ca99502e89089286357e724937917eaa  zcp-7.0.3.tar.gz
diff --git a/zarafa.spec b/zarafa.spec
index 192ac87..da829f6 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -1,7 +1,7 @@
 %global beta_or_rc      0
 %global actual_release  1
-%global svnrevision     29470
-%global with_clucene    0
+%global svnrevision     30515
+%global with_clucene    1
 %global with_ldap       1
 %global with_xmlto      1
 %global no_multiupload  1
@@ -18,7 +18,7 @@
 
 Summary:            Open Source Edition of the Zarafa Collaboration Platform
 Name:               zarafa
-Version:            7.0.2
+Version:            7.0.3
 %if %{beta_or_rc}
 Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}
 %else
@@ -72,8 +72,12 @@ BuildRequires:      python-devel >= 2.4
 %endif
 
 %if %{with_clucene}
+%if 0%{?fedora} > 15
+BuildRequires:      clucene09-core-devel >= 0.9.21b-1
+%else
 BuildRequires:      clucene-core-devel >= 0.9.21b-1
 %endif
+%endif
 
 %if %{with_ldap}
 BuildRequires:      openldap-devel
@@ -146,6 +150,7 @@ creation of the zarafa user for the different Zarafa services.
 Summary:            Mail Delivery Agent for Zarafa Collaboration Platform
 Group:              System Environment/Daemons
 Requires:           zarafa-common = %{version}-%{release}
+Requires:           php-mapi%{?_isa} = %{version}-%{release}
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/service, /sbin/chkconfig
 Requires(postun):   /sbin/service
@@ -368,13 +373,22 @@ export CPPFLAGS="$CPPFLAGS -I%{_includedir}/boost141"
 export LDFLAGS="$LDFLAGS -L%{_libdir}/boost141"
 %endif
 
+%if 0%{?fedora} > 15
+export LDFLAGS="$LDFLAGS -L%{_libdir}/clucene09"
+%endif
+
 %configure \
     --with-userscript-prefix=%{_sysconfdir}/%{name}/userscripts \
     --with-quotatemplate-prefix=%{_sysconfdir}/%{name}/quotamail \
     --with-indexerscripts-prefix=%{_datadir}/%{name}/indexerscripts \
 %if %{with_clucene}
+%if 0%{?fedora} > 15
+    --with-clucene-lib-prefix=%{_libdir}/clucene09 \
+    --with-clucene-include-prefix=%{_includedir}/clucene09 \
+%else
     --with-clucene-lib-prefix=%{_libdir} \
     --with-clucene-include-prefix=%{_includedir} \
+%endif
 %else
     --with-clucene-lib-prefix= \
 %endif
@@ -674,6 +688,7 @@ fi
 %doc installer/linux/createuser.dotforward
 %{_bindir}/%{name}-autorespond
 %{_bindir}/%{name}-dagent
+%{_bindir}/%{name}-mr-accept
 %config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/dagent.cfg
 %config(noreplace) %{_sysconfdir}/%{name}/autorespond
 %{_sysconfdir}/rc.d/init.d/%{name}-dagent
@@ -855,6 +870,9 @@ fi
 %endif
 
 %changelog
+* Sun Nov 20 2011 Robert Scheck <robert at fedoraproject.org> 7.0.3-1
+- Upgrade to 7.0.3
+
 * Sat Oct 01 2011 Robert Scheck <robert at fedoraproject.org> 7.0.2-1
 - Upgrade to 7.0.2 (#717968)