- up to 2.2.18

diff --git a/dovecot-exttextcat.patch b/dovecot-exttextcat.patch
deleted file mode 100644 (file)
index 578b053..0000000
--- a/dovecot-exttextcat.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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-rpath.patch b/dovecot-rpath.patch
index 810cea05d668136e53f14ce0a0315a83acdafc31..89f885fc2704cc2f0bad520d3d48a2cd0ff81d08 100644 (file)
--- a/dovecot-rpath.patch
+++ b/dovecot-rpath.patch
@@ -1,10 +1,9 @@
-diff -dur dovecot-2.2.9.orig/Makefile.am dovecot-2.2.9/Makefile.am
---- dovecot-2.2.9.orig/Makefile.am     2013-11-24 14:37:39.000000000 +0100
-+++ dovecot-2.2.9/Makefile.am  2013-12-09 15:47:40.000000000 +0100
-@@ -64,7 +64,7 @@
-       $(mkdir_p) $(DESTDIR)$(pkglibdir); \
+--- dovecot-2.2.18/Makefile.am~        2015-02-19 12:44:40.000000000 +0100
++++ dovecot-2.2.18/Makefile.am 2015-05-17 08:43:25.681245560 +0200
+@@ -64,7 +64,7 @@ install-exec-hook:
        grep -v '^LIBDOVECOT_.*_INCLUDE' dovecot-config | \
        grep -v '^LIBDOVECOT.*_DEPS' | sed \
+       -e "s|^\(DOVECOT_INSTALLED\)=.*$$|\1=yes|" \
 -      -e "s|^\(LIBDOVECOT\)=.*$$|\1='-L$(pkglibdir) -ldovecot'|" \
 +      -e "s|^\(LIBDOVECOT\)=.*$$|\1='-rpath $(pkglibdir) -L$(pkglibdir) -ldovecot'|" \
        -e "s|^\(LIBDOVECOT_LOGIN\)=.*$$|\1='-ldovecot-login $(SSL_LIBS)'|" \

diff --git a/dovecot.spec b/dovecot.spec
index bffe66e3138a4728ee02f1da0b8301a60cb06ec0..a5c66a0a04cf14612543761f4c0854a3cbd50392 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -11,20 +11,20 @@
 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:       3
+Version:       2.2.18
+Release:       1
 Epoch:         1
 License:       MIT (libraries), LGPL v2.1 (the rest)
 Group:         Networking/Daemons
 Source0:       http://dovecot.org/releases/2.2/%{name}-%{version}.tar.gz
-# Source0-md5: c6c176943bd832c780fbb5d2f8850952
+# Source0-md5: 1e42eb3b69544c447ad882d7858f3630
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       %{name}.tmpfiles
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-rpath.patch
-Patch2:                %{name}-exttextcat.patch
+
 Patch3:                %{name}-disableSSLv3.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf
@@ -156,7 +156,7 @@ Współdzielone biblioteki Dovecota.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+
 %patch3 -p2
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf
@@ -348,6 +348,9 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/plugins/dict/*.so
 %dir %{_libdir}/%{name}/plugins/doveadm
 %attr(755,root,root) %{_libdir}/%{name}/plugins/doveadm/*.so
+%dir %{_libdir}/%{name}/plugins/stats
+%attr(755,root,root) %{_libdir}/%{name}/plugins/stats/*.so
+%{_datadir}/dovecot
 %{systemdunitdir}/dovecot.service
 %{systemdunitdir}/dovecot.socket
 /usr/lib/tmpfiles.d/%{name}.conf