- rebuild with mysql 5.7

[packages/dovecot.git] / dovecot.spec

diff --git a/dovecot.spec b/dovecot.spec
index 82d76d0527b3fa3116f60a91b75d02081e476034..fdf37f09f0c0397e482c32cb3a13e0c3f8553f3a 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -11,13 +11,13 @@
 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.30.2
-Release:       1
+Version:       2.2.34
+Release:       2
 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: 44a8f904ff1086d2cc7fa99e202f4a7d
+# Source0-md5: 29a2e7812c34e6b35db4f86260fed197
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
@@ -36,6 +36,7 @@ BuildRequires:        curl-devel
 BuildRequires: expat-devel
 BuildRequires: gettext-tools
 %{?with_gssapi:BuildRequires:  heimdal-devel}
+BuildRequires: libapparmor-devel
 BuildRequires: libcap-devel
 BuildRequires: libicu-devel
 BuildRequires: libstemmer-devel
@@ -169,13 +170,13 @@ Pakiet programistyczny do tworzenia wtyczek dla Dovecota.
 %build
 touch config.rpath
 %{__libtoolize}
-%{__aclocal} -I .
+%{__aclocal} -I . -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
        ac_cv_prog_VALGRIND=no \
-       CPPFLAGS="%{rpmcppflags} -I/usr/include/libstemmer" \
+       CPPFLAGS="%{rpmcppflags} -I/usr/include/libstemmer -D_LINUX_QUOTA_VERSION=2" \
        --disable-static \
        %{?debug:--enable-debug} \
        %{?with_ldap:--with-ldap=yes} \
@@ -311,42 +312,45 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.imap
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/aggregator
-%attr(755,root,root) %{_libdir}/%{name}/anvil
-%attr(755,root,root) %{_libdir}/%{name}/auth
-%attr(755,root,root) %{_libdir}/%{name}/checkpassword-reply
-%attr(755,root,root) %{_libdir}/%{name}/config
-%attr(755,root,root) %{_libdir}/%{name}/decode2text.sh
-%attr(755,root,root) %{_libdir}/%{name}/deliver
-%attr(755,root,root) %{_libdir}/%{name}/dict
-%attr(755,root,root) %{_libdir}/%{name}/director
-%attr(755,root,root) %{_libdir}/%{name}/dns-client
-%attr(755,root,root) %{_libdir}/%{name}/doveadm-server
-%attr(755,root,root) %{_libdir}/%{name}/dovecot-lda
-%attr(755,root,root) %{_libdir}/%{name}/gdbhelper
-%attr(755,root,root) %{_libdir}/%{name}/imap
-%attr(755,root,root) %{_libdir}/%{name}/imap-hibernate
-%attr(755,root,root) %{_libdir}/%{name}/imap-login
-%attr(755,root,root) %{_libdir}/%{name}/imap-urlauth
-%attr(755,root,root) %{_libdir}/%{name}/imap-urlauth-login
-%attr(755,root,root) %{_libdir}/%{name}/imap-urlauth-worker
-%attr(755,root,root) %{_libdir}/%{name}/indexer
-%attr(755,root,root) %{_libdir}/%{name}/indexer-worker
-%attr(755,root,root) %{_libdir}/%{name}/ipc
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/%{name}
+%endif
+%attr(755,root,root) %{_libexecdir}/%{name}/aggregator
+%attr(755,root,root) %{_libexecdir}/%{name}/anvil
+%attr(755,root,root) %{_libexecdir}/%{name}/auth
+%attr(755,root,root) %{_libexecdir}/%{name}/checkpassword-reply
+%attr(755,root,root) %{_libexecdir}/%{name}/config
+%attr(755,root,root) %{_libexecdir}/%{name}/decode2text.sh
+%attr(755,root,root) %{_libexecdir}/%{name}/deliver
+%attr(755,root,root) %{_libexecdir}/%{name}/dict
+%attr(755,root,root) %{_libexecdir}/%{name}/director
+%attr(755,root,root) %{_libexecdir}/%{name}/dns-client
+%attr(755,root,root) %{_libexecdir}/%{name}/doveadm-server
+%attr(755,root,root) %{_libexecdir}/%{name}/dovecot-lda
+%attr(755,root,root) %{_libexecdir}/%{name}/gdbhelper
+%attr(755,root,root) %{_libexecdir}/%{name}/imap
+%attr(755,root,root) %{_libexecdir}/%{name}/imap-hibernate
+%attr(755,root,root) %{_libexecdir}/%{name}/imap-login
+%attr(755,root,root) %{_libexecdir}/%{name}/imap-urlauth
+%attr(755,root,root) %{_libexecdir}/%{name}/imap-urlauth-login
+%attr(755,root,root) %{_libexecdir}/%{name}/imap-urlauth-worker
+%attr(755,root,root) %{_libexecdir}/%{name}/indexer
+%attr(755,root,root) %{_libexecdir}/%{name}/indexer-worker
+%attr(755,root,root) %{_libexecdir}/%{name}/ipc
+%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}/pop3
+%attr(755,root,root) %{_libexecdir}/%{name}/pop3-login
+%attr(755,root,root) %{_libexecdir}/%{name}/quota-status
+%attr(755,root,root) %{_libexecdir}/%{name}/rawlog
+%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}/ssl-params
+%attr(755,root,root) %{_libexecdir}/%{name}/stats
+%attr(755,root,root) %{_libexecdir}/%{name}/xml2text
 %attr(755,root,root) %{_libdir}/%{name}/libdcrypt_openssl.so
-%attr(755,root,root) %{_libdir}/%{name}/lmtp
-%attr(755,root,root) %{_libdir}/%{name}/log
-%attr(755,root,root) %{_libdir}/%{name}/maildirlock
-%attr(755,root,root) %{_libdir}/%{name}/pop3
-%attr(755,root,root) %{_libdir}/%{name}/pop3-login
-%attr(755,root,root) %{_libdir}/%{name}/quota-status
-%attr(755,root,root) %{_libdir}/%{name}/rawlog
-%attr(755,root,root) %{_libdir}/%{name}/replicator
-%attr(755,root,root) %{_libdir}/%{name}/script
-%attr(755,root,root) %{_libdir}/%{name}/script-login
-%attr(755,root,root) %{_libdir}/%{name}/ssl-params
-%attr(755,root,root) %{_libdir}/%{name}/stats
-%attr(755,root,root) %{_libdir}/%{name}/xml2text
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
 %dir %{_libdir}/%{name}/plugins/auth