X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dovecot.spec;h=3cd9ee771d4cc33978c359c742a227576e6508b9;hb=edea71d;hp=bfc2e92db551dbfcb6777a5b141ff54012e5fea0;hpb=1ceccb88f58f2f1082fbcfb465cbc7d202fd25b1;p=packages%2Fdovecot.git

diff --git a/dovecot.spec b/dovecot.spec
index bfc2e92..3cd9ee7 100644
--- 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.25
+Version:	2.2.32
 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:	8f62ea76489c47c369cbbe0b19818448
+# Source0-md5:	534feae88700ddc704584e0fc8ee5bdc
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
@@ -64,7 +64,10 @@ Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	pam >= 0.79.0
 Provides:	group(dovecot)
 Provides:	imapdaemon
+Provides:	pop3daemon
 Provides:	user(dovecot)
+# heimdal-daemons in PLD contained only "popper" (kerberized POP3 daemon)
+%{?with_gssapi:Obsoletes:	heimdal-daemons}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_check_so	1
@@ -131,6 +134,17 @@ Stan:
 - quota Maildir++ jest obsługiwana, ale twarda quota na systemach
   plików może być problematyczna
 
+%package libs
+Summary:	Dovecot shared libraries
+Summary(pl.UTF-8):	Współdzielone biblioteki Dovecota
+Group:		Development/Libraries
+
+%description libs
+Dovecot shared libraries.
+
+%description libs -l pl.UTF-8
+Współdzielone biblioteki Dovecota.
+
 %package devel
 Summary:	Development package for Dovecot plugins
 Summary(pl.UTF-8):	Pakiet programistyczny do tworzenia wtyczek dla Dovecota
@@ -143,30 +157,19 @@ Development package for Dovecot plugins.
 %description devel -l pl.UTF-8
 Pakiet programistyczny do tworzenia wtyczek dla Dovecota.
 
-%package libs
-Summary:	Dovecot shared libraries
-Summary(pl.UTF-8):	Współdzielone biblioteki Dovecota
-Group:		Development/Libraries
-
-%description libs
-Dovecot shared libraries.
-
-%description libs -l pl.UTF-8
-Współdzielone biblioteki Dovecota.
-
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 
-%patch3 -p2
+%patch3 -p1
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf
 
 %build
 touch config.rpath
 %{__libtoolize}
-%{__aclocal} -I .
+%{__aclocal} -I . -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -367,21 +370,6 @@ fi
 %{_mandir}/man1/dsync.1*
 %{_mandir}/man7/doveadm-search-query.7*
 
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/libdovecot.so
-%attr(755,root,root) %{_libdir}/%{name}/libdovecot-compression.so
-%attr(755,root,root) %{_libdir}/%{name}/libdovecot-dsync.so
-%attr(755,root,root) %{_libdir}/%{name}/libdovecot-fts.so
-%attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so
-%{?with_ldap:%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ldap.so}
-%attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so
-%attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so
-%attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so
-%{_libdir}/%{name}/%{name}-config
-%{_includedir}/%{name}
-%{_aclocaldir}/dovecot.m4
-
 %files libs
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}
@@ -406,3 +394,18 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so.0
 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so.0
 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so.0
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot.so
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-compression.so
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-dsync.so
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-fts.so
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so
+%{?with_ldap:%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ldap.so}
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so
+%{_libdir}/%{name}/%{name}-config
+%{_includedir}/%{name}
+%{_aclocaldir}/dovecot.m4