- rel 2; enable lucene/stemmer/solr for full text search indexing (http://wiki2.dovec...

diff --git a/dovecot-exttextcat.patch b/dovecot-exttextcat.patch
new file mode 100644 (file)
index 0000000..578b053
--- /dev/null
+++ b/dovecot-exttextcat.patch
@@ -0,0 +1,23 @@
+--- dovecot-2.2.15/configure.ac~       2014-10-25 05:57:08.000000000 +0200
++++ dovecot-2.2.15/configure.ac        2014-11-14 08:49:02.888452270 +0100
+@@ -2747,10 +2747,16 @@
+       have_lucene_textcat=yes
+       AC_DEFINE(HAVE_LUCENE_TEXTCAT,, Define if you want textcat support for CLucene)
+       ], [
+-        AC_CHECK_LIB(exttextcat, special_textcat_Init, [
+-          have_lucene_exttextcat=yes
+-          AC_DEFINE(HAVE_LUCENE_EXTTEXTCAT,, Define if you want textcat (Debian version) support for CLucene)
+-        ])
++      if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists libexttextcat 2>/dev/null; then
++              PKG_CHECK_MODULES(LIBEXTTEXTCAT, libexttextcat)
++              LIBS="$LIBS $LIBEXTTEXTCAT_LIBS"
++              AC_DEFINE(HAVE_LUCENE_EXTTEXTCAT,, Define if you want textcat (LibreOffice version) support for CLucene)
++      else
++              AC_CHECK_LIB(exttextcat, special_textcat_Init, [
++                      have_lucene_exttextcat=yes
++                      AC_DEFINE(HAVE_LUCENE_EXTTEXTCAT,, Define if you want textcat (Debian version) support for CLucene)
++              ])
++      fi
+       ])
+     ], [
+       if test $want_stemmer = yes; then

diff --git a/dovecot.spec b/dovecot.spec
index 4e57ab24f507d06fb75e60bbd1889716faf536dd..32c7fbd48520b651694979ffbdab63717c17597d 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -12,7 +12,7 @@ Summary:      IMAP and POP3 server written with security primarily in mind
 Summary(pl.UTF-8):     Serwer IMAP i POP3 pisany głównie z myślą o bezpieczeństwie
 Name:          dovecot
 Version:       2.2.15
-Release:       1
+Release:       2
 Epoch:         1
 License:       MIT (libraries), LGPL v2.1 (the rest)
 Group:         Networking/Daemons
@@ -24,15 +24,22 @@ Source3:    %{name}.sysconfig
 Source4:       %{name}.tmpfiles
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-rpath.patch
+Patch2:                %{name}-exttextcat.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bzip2-devel
+BuildRequires: clucene-core-devel
+BuildRequires: curl-devel
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.0}
+BuildRequires: expat-devel
 BuildRequires: gettext-devel
 %{?with_gssapi:BuildRequires:  heimdal-devel}
 BuildRequires: libcap-devel
+BuildRequires: libstemmer-devel
+BuildRequires: libexttextcat-devel
 BuildRequires: libtool
+BuildRequires: lz4-devel
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.3}
 BuildRequires: openssl-devel >= 0.9.7d
@@ -148,6 +155,7 @@ Współdzielone biblioteki Dovecota.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf
 
@@ -159,6 +167,7 @@ touch config.rpath
 %{__autoheader}
 %{__automake}
 %configure \
+       CPPFLAGS="%{rpmcppflags} -I/usr/include/libstemmer" \
        --disable-static \
        %{?debug:--enable-debug} \
        %{?with_ldap:--with-ldap=yes} \
@@ -166,6 +175,9 @@ touch config.rpath
        %{?with_pgsql:--with-pgsql} \
        %{?with_sqlite:--with-sqlite} \
        %{?with_gssapi:--with-gssapi=plugin} \
+       --with-lucene \
+       --with-stemmer \
+       --with-solr \
        --with-sql=plugin \
        --with-pam \
        --with-zlib \