[zarafa/el4] Upgrade to 6.40.12

[Robert Scheck]

commit 079e83fe1f9c2b0173147900f60d6f4a4f740256
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Nov 20 02:19:45 2011 +0100

    Upgrade to 6.40.12

 .gitignore  |    2 +-
 sources     |    2 +-
 zarafa.spec |   20 ++++++++++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6269c53..45562c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-zcp-6.40.11.tar.gz
+zcp-6.40.12.tar.gz
diff --git a/sources b/sources
index bd04a9a..9228b8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8778600b44b06b9433e71760b84d282a  zcp-6.40.11.tar.gz
+054c51daffe63189790a80bbf04ca6a0  zcp-6.40.12.tar.gz
diff --git a/zarafa.spec b/zarafa.spec
index 6273b1e..d30e26c 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -1,6 +1,6 @@
 %global beta_or_rc      0
 %global actual_release  1
-%global svnrevision     28965
+%global svnrevision     29942
 %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.11
+Version:            6.40.12
 %if %{beta_or_rc}
 Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}
 %else
@@ -71,8 +71,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
@@ -367,13 +371,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
@@ -863,6 +876,9 @@ fi
 %endif
 
 %changelog
+* Sun Nov 20 2011 Robert Scheck <robert at fedoraproject.org> 6.40.12-1
+- Upgrade to 6.40.12
+
 * Sun Sep 11 2011 Robert Scheck <robert at fedoraproject.org> 6.40.11-1
 - Upgrade to 6.40.11