X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dovecot.spec;h=50235ffe3e7773c653fd038f6fa5b7c3e3dc2bbd;hb=d788add849d69049267717916a13cb472b9738a7;hp=22898cd62c57cfb56a0ecc2ce0441046ea537a89;hpb=879baaa6ae25a1bbe0851ff7d71c0de1fc7dfc65;p=packages%2Fdovecot.git

diff --git a/dovecot.spec b/dovecot.spec
index 22898cd..50235ff 100644
--- 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.29.1
+Version:	2.2.35
 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:	5c9f69bcda1b48cc7a64b94a311df07f
+# Source0-md5:	6998a3b16c42a8b3c7086b03fa781fba
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Source4:	%{name}.tmpfiles
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-rpath.patch
-
+Patch2:		%{name}-local_name.patch
 Patch3:		%{name}-disableSSLv3.patch
 URL:		http://dovecot.org/
 BuildRequires:	autoconf
@@ -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
@@ -161,7 +162,7 @@ Pakiet programistyczny do tworzenia wtyczek dla Dovecota.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-
+%patch2 -p1
 %patch3 -p1
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf
@@ -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