- --with-ldap=yes instead of plugin ( with plugin I can't get it to work)

[packages/dovecot.git] / dovecot.spec

diff --git a/dovecot.spec b/dovecot.spec
index 784d1c18be9b25ab82c90a2be2fa3a1b526e59a5..d136f8f054dc41d6c47b0d6c4225faae88ea8685 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -10,13 +10,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:       1.1.5
-Release:       1
+Version:       1.2.6
+Release:       2
 Epoch:         1
 License:       MIT (libraries), LGPL v2.1 (the rest)
 Group:         Networking/Daemons
-Source0:       http://dovecot.org/releases/1.1/%{name}-%{version}.tar.gz
-# Source0-md5: 64e7809aeee750e7c86d81777078e434
+Source0:       http://dovecot.org/releases/1.2/%{name}-%{version}.tar.gz
+# Source0-md5: 807666f1a112e7379c4dbb57c9ce4899
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
@@ -24,9 +24,12 @@ Patch0:              %{name}-config.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: bzip2-devel
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.0}
+BuildRequires: findutils
 BuildRequires: gettext-devel
-%{?with_gssapi:BuildRequires:  krb5-devel}
+%{?with_gssapi:BuildRequires:  heimdal-devel}
+BuildRequires: libcap-devel
 BuildRequires: libtool
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.3}
@@ -36,6 +39,7 @@ BuildRequires:        pkgconfig
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: sed >= 4.0
 %{?with_sqlite:BuildRequires:  sqlite3-devel}
+BuildRequires: zlib-devel
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
@@ -140,14 +144,16 @@ touch config.rpath
        --disable-static \
        %{?debug:--enable-debug} \
        --enable-header-install \
-       %{?with_ldap:--with-ldap} \
+       %{?with_ldap:--with-ldap=yes} \
        %{?with_mysql:--with-mysql} \
        %{?with_pgsql:--with-pgsql} \
-       %{?with_sasl:--with-cyrus-sasl2} \
        %{?with_sqlite:--with-sqlite} \
-       %{?with_gssapi:--with-gssapi} \
+       %{?with_gssapi:--with-gssapi=plugin} \
+       --with-zlib \
+       --with-bzlib \
+       --with-libcap \
        --with-ssl=openssl \
-       --with-ssl-dir=/var/lib/openssl \
+       --with-ssldir=/var/lib/openssl \
        --sysconfdir=/etc/%{name}
 
 %{__make}
@@ -169,16 +175,17 @@ install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.imap
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins{,/imap}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins{,/auth,/imap}/*.la
 
 # devel
 for folder in deliver imap lib lib-imap lib-mail lib-storage; do
        install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/$folder
        install -p -m644 src/$folder/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/$folder/
 done
-for dir in lib lib-imap lib-mail lib-storage; do
-       install -d $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/src/$dir
-       install -p -m644 src/$dir/*.a $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/src/$dir
+for dir in lib lib-auth lib-charset lib-imap lib-index lib-mail lib-storage; do
+       for file in $(find src/$dir -name '*.a'); do
+               install -D -m644 $file $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/$file
+       done
 done
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/dovecot-config $RPM_BUILD_ROOT%{_libdir}/%{name}-devel
 
@@ -225,6 +232,8 @@ echo "Configuration change default_mail_env -> mail_location"
 %attr(755,root,root) %{_sbindir}/%{name}pw
 %attr(750,root,root) %dir %{_sysconfdir}/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}-db-example.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}-dict-sql-example.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}-ldap-example.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}-sql-example.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/%{name}
@@ -232,6 +241,7 @@ echo "Configuration change default_mail_env -> mail_location"
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/authtest
 %attr(755,root,root) %{_libdir}/%{name}/checkpassword-reply
 %attr(755,root,root) %{_libdir}/%{name}/deliver
 %attr(755,root,root) %{_libdir}/%{name}/dict
@@ -240,6 +250,7 @@ echo "Configuration change default_mail_env -> mail_location"
 %attr(755,root,root) %{_libdir}/%{name}/idxview
 %attr(755,root,root) %{_libdir}/%{name}/imap
 %attr(755,root,root) %{_libdir}/%{name}/imap-login
+%attr(755,root,root) %{_libdir}/%{name}/imap-utf7
 %attr(755,root,root) %{_libdir}/%{name}/convert-tool
 %attr(755,root,root) %{_libdir}/%{name}/expire-tool
 %attr(755,root,root) %{_libdir}/%{name}/listview
@@ -249,8 +260,11 @@ echo "Configuration change default_mail_env -> mail_location"
 %attr(755,root,root) %{_libdir}/%{name}/pop3-login
 %attr(755,root,root) %{_libdir}/%{name}/rawlog
 %attr(755,root,root) %{_libdir}/%{name}/ssl-build-param
+%attr(755,root,root) %{_libdir}/%{name}/threadview
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
+#%dir %{_libdir}/%{name}/plugins/auth
+#%attr(755,root,root)%{_libdir}/%{name}/plugins/auth/*.so
 %dir %{_libdir}/%{name}/plugins/imap
 %attr(755,root,root)%{_libdir}/%{name}/plugins/imap/*.so
 %dir %{_libdir}/%{name}/plugins/lda