- updated to 2.3.2.1, misc PLD merge

diff --git a/dovecot.spec b/dovecot.spec
index b1a34621f8abee8e7315ef8dbe08465c7257fe85..2d6a91e1c9de65914f52f98b502ac3965f173d6e 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -11,18 +11,19 @@
 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.3.2
-Release:       1
+Version:       2.3.2.1
+Release:       2
 Epoch:         1
 License:       MIT (libraries), LGPL v2.1 (the rest)
 Group:         Networking/Daemons
 Source0:       http://dovecot.org/releases/2.3/%{name}-%{version}.tar.gz
-# Source0-md5: e4566e50c9f1e5ee7d3c5c734a83ccf7
+# Source0-md5: 77a7fa95b38bd6686e6191b2b3f2b87b
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-rpath.patch
+Patch2:                crypt.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -155,9 +156,10 @@ Development package for Dovecot plugins.
 Pakiet programistyczny do tworzenia wtyczek dla Dovecota.
 
 %prep
-%setup -q -n %{name}-%{version}
+%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
 
@@ -325,6 +327,7 @@ fi
 %attr(755,root,root) %{_libexecdir}/%{name}/lmtp
 %attr(755,root,root) %{_libexecdir}/%{name}/log
 %attr(755,root,root) %{_libexecdir}/%{name}/maildirlock
+%attr(755,root,root) %{_libexecdir}/%{name}/old-stats
 %attr(755,root,root) %{_libexecdir}/%{name}/pop3
 %attr(755,root,root) %{_libexecdir}/%{name}/pop3-login
 %attr(755,root,root) %{_libexecdir}/%{name}/quota-status
@@ -332,10 +335,9 @@ fi
 %attr(755,root,root) %{_libexecdir}/%{name}/replicator
 %attr(755,root,root) %{_libexecdir}/%{name}/script
 %attr(755,root,root) %{_libexecdir}/%{name}/script-login
+%attr(755,root,root) %{_libexecdir}/%{name}/stats
 %attr(755,root,root) %{_libexecdir}/%{name}/submission
 %attr(755,root,root) %{_libexecdir}/%{name}/submission-login
-%attr(755,root,root) %{_libexecdir}/%{name}/stats
-%attr(755,root,root) %{_libexecdir}/%{name}/old-stats
 %attr(755,root,root) %{_libexecdir}/%{name}/xml2text
 %attr(755,root,root) %{_libdir}/%{name}/libdcrypt_openssl.so
 %dir %{_libdir}/%{name}/plugins