[dovecot/f14/master] Apply 1 latest change(s) from master branch

[Michal Hlavinka]

commit 0015753290b43d9822006caf9ce6c01834c1bb2d
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Wed Apr 13 10:56:53 2011 +0200

    Apply 1 latest change(s) from master branch

 .gitignore                    |    1 +
 dovecot-2.0.11-settings.patch |   25 -------------------------
 dovecot.spec                  |    8 ++------
 sources                       |    2 +-
 4 files changed, 4 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f92e071..ebbeee1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ pigeonhole-snap0592366457df.tar.bz2
 /dovecot-2.0-pigeonhole-0.2.2.tar.gz
 /dovecot-2.0.9.tar.gz
 /dovecot-2.0.11.tar.gz
+/dovecot-2.0.12.tar.gz
diff --git a/dovecot.spec b/dovecot.spec
index 5938988..96d1231 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,8 +1,8 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 2.0.11
-Release: 2%{?dist}
+Version: 2.0.12
+Release: 1%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -26,9 +26,6 @@ Patch1: dovecot-2.0-defaultconfig.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
-#for < 2.0.12, rhbz#690401
-Patch4: dovecot-2.0.11-settings.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel, bzip2-devel, libcap-devel
 BuildRequires: libtool, autoconf, automake, pkgconfig
@@ -105,7 +102,6 @@ This package provides the development files for dovecot.
 %patch1 -p1 -b .default-settings
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
-%patch4 -p1 -b .settings
 
 %build
 #required for fdpass.c line 125,190: dereferencing type-punned pointer will break strict-aliasing rules
diff --git a/sources b/sources
index a22a44b..652e33e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-088a850d6583a7ec0a8074ce929b3496  dovecot-2.0.11.tar.gz
+689e1a8863d4fb2fd252e1a6121dd181  dovecot-2.0.12.tar.gz
 23b9be534c62257a0d049b1370f11a99  dovecot-2.0-pigeonhole-0.2.2.tar.gz