- updated to 1.1.0 (+DEVEL merge)

Changed files:
    dovecot.spec -> 1.90

diff --git a/dovecot.spec b/dovecot.spec
index 3cc53a472961d56a9c76204afe640c55e0586a13..ac11577913c9ac14add11206ea9c5c4a3c6e6581 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,5 +1,6 @@
 #
 # Conditional build:
+%bcond_with    gssapi  # with GSSAPI support
 %bcond_without ldap    # without LDAP auth
 %bcond_without mysql   # without MySQL auth
 %bcond_without pgsql   # without PostgreSQL auth
@@ -9,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.0.14
+Version:       1.1.0
 Release:       1
 Epoch:         1
 License:       MIT (libraries), LGPL v2.1 (the rest)
 Group:         Networking/Daemons
-Source0:       http://dovecot.org/releases/1.0/%{name}-%{version}.tar.gz
-# Source0-md5: 89e295832dd5c4ba93d68454e74d7ae3
+Source0:       http://dovecot.org/releases/1.1/%{name}-%{version}.tar.gz
+# Source0-md5: 2f173eaad8ae74782bbceecaf90d1e45
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
@@ -25,7 +26,7 @@ BuildRequires:        autoconf
 BuildRequires: automake
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.0}
 BuildRequires: gettext-devel
-BuildRequires: krb5-devel
+%{?with_gssapi:BuildRequires:  krb5-devel}
 BuildRequires: libtool
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.3}
@@ -144,7 +145,7 @@ touch config.rpath
        %{?with_pgsql:--with-pgsql} \
        %{?with_sasl:--with-cyrus-sasl2} \
        %{?with_sqlite:--with-sqlite} \
-       --with-gssapi \
+       %{?with_gssapi:--with-gssapi} \
        --with-ssl=openssl \
        --with-ssl-dir=/var/lib/openssl \
        --sysconfdir=/etc/%{name}
@@ -172,6 +173,10 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.imap
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins{,/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
@@ -217,6 +222,8 @@ fi
 %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}-ldap.conf.example
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}-sql.conf.example
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/%{name}
 %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}
@@ -230,6 +237,9 @@ fi
 %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}/convert-tool
+%attr(755,root,root) %{_libdir}/%{name}/expire-tool
+%attr(755,root,root) %{_libdir}/%{name}/listview
 %attr(755,root,root) %{_libdir}/%{name}/logview
 %attr(755,root,root) %{_libdir}/%{name}/pop3
 %attr(755,root,root) %{_libdir}/%{name}/pop3-login