SPECS: dovecot.spec - updated to 1.1.0 (+DEVEL merge)

[adamg]

Author: adamg                        Date: Sat Jun 21 08:14:13 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.1.0 (+DEVEL merge)

---- Files affected:
SPECS:
   dovecot.spec (1.89 -> 1.90) 

---- Diffs:

================================================================
Index: SPECS/dovecot.spec
diff -u SPECS/dovecot.spec:1.89 SPECS/dovecot.spec:1.90
--- SPECS/dovecot.spec:1.89	Tue Jun  3 08:51:13 2008
+++ SPECS/dovecot.spec	Sat Jun 21 10:14:07 2008
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 #
 # 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
@@ -10,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:	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
@@ -26,7 +27,7 @@
 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}
@@ -145,7 +146,7 @@
 	%{?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}
@@ -173,6 +174,10 @@
 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
@@ -218,6 +223,8 @@
 %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}
@@ -231,6 +238,9 @@
 %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
@@ -259,6 +269,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.90  2008/06/21 08:14:07  adamg
+- updated to 1.1.0 (+DEVEL merge)
+
 Revision 1.89  2008/06/03 06:51:13  arekm
 - up to 1.0.14
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dovecot.spec?r1=1.89&r2=1.90&f=u