[dovecot] major update to dovecot 2.2 RC2

[Michal Hlavinka]

commit ad771a9d2a3988d71d20266885fee9e09d8f2bb5
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Wed Feb 27 13:06:12 2013 +0100

    major update to dovecot 2.2 RC2

 .gitignore                      |    4 +++-
 dovecot-2.1.10-waitonline.patch |    4 ++--
 dovecot.spec                    |   31 ++++++++++++++++++++-----------
 sources                         |    4 ++--
 4 files changed, 27 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 537d63e..22e1c05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,8 +49,8 @@ pigeonhole-snap0592366457df.tar.bz2
 /dovecot-2.1.5.tar.gz
 /dovecot-2.1.6.tar.gz
 /dovecot-2.1.7.tar.gz
-/dovecot-2.1.8.tar.gz
 /dovecot-2.1-pigeonhole-0.3.1.tar.gz
+/dovecot-2.1.8.tar.gz
 /dovecot-2.1.9.tar.gz
 /dovecot-2.1.10.tar.gz
 /dovecot-2.1-pigeonhole-0.3.3.tar.gz
@@ -58,3 +58,5 @@ pigeonhole-snap0592366457df.tar.bz2
 /dovecot-2.1.13.tar.gz
 /dovecot-2.1.14.tar.gz
 /dovecot-2.1.15.tar.gz
+/dovecot-2.2.rc2.tar.gz
+/pigeonhole-99eec511aa2c.tar.bz2
diff --git a/dovecot-2.1.10-waitonline.patch b/dovecot-2.1.10-waitonline.patch
index 324094c..6795504 100644
--- a/dovecot-2.1.10-waitonline.patch
+++ b/dovecot-2.1.10-waitonline.patch
@@ -1,6 +1,6 @@
 diff -up dovecot-2.1.10/dovecot.service.in.waitonline dovecot-2.1.10/dovecot.service.in
---- dovecot-2.1.10/dovecot.service.in.waitonline	2012-11-08 17:09:14.025772652 +0100
-+++ dovecot-2.1.10/dovecot.service.in	2012-11-08 17:10:06.472155786 +0100
+--- dovecot-2.1.10/dovecot.service.in.waitonline	2012-11-20 14:19:47.000000000 +0100
++++ dovecot-2.1.10/dovecot.service.in	2012-11-20 14:20:29.245076250 +0100
 @@ -4,6 +4,7 @@ After=local-fs.target network.target
  
  [Service]
diff --git a/dovecot.spec b/dovecot.spec
index d835d55..13977c0 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,19 +1,21 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 2.1.15
-#global prever .rc6
-Release: 1%{?dist}
+Version: 2.2
+%global prever .rc2
+Release: 0%{?dist}.1
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
 
 URL: http://www.dovecot.org/
-Source: http://www.dovecot.org/releases/2.1/%{name}-%{version}%{?prever}.tar.gz
+Source: http://www.dovecot.org/releases/2.2/%{name}-%{version}%{?prever}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
-%global pigeonholever 0.3.3
-Source8: http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-pigeonhole-%{pigeonholever}.tar.gz
+%global pigeonholever 99eec511aa2c
+#pigeonhole for dovecot 2.2 has not been released yet, only repo snapshot
+Source8: pigeonhole-99eec511aa2c.tar.bz2
+#Source8: http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-pigeonhole-%{pigeonholever}.tar.gz
 #wget http://hg.rename-it.nl/dovecot-2.1-pigeonhole/archive/%{pigeonholever}.tar.bz2 -O dovecot-2.1-pigeonhole-%{pigeonholever}.tar.bz2
 #Source8: dovecot-2.1-pigeonhole-%{pigeonholever}.tar.bz2
 Source9: dovecot.sysconfig
@@ -167,9 +169,12 @@ sed -i 's|/etc/ssl|/etc/pki/dovecot|' doc/mkcert.sh doc/example-config/conf.d/10
 make %{?_smp_mflags}
 
 #pigeonhole
-pushd dovecot-2.1-pigeonhole-%{pigeonholever}
-#./autogen.sh
-#autoreconf -fiv
+pushd dovecot-2-2-pigeonhole-%{pigeonholever}
+
+# required for snapshot
+[ -f configure ] || autoreconf -fiv
+[ -f ChangeLog ] || echo "Pigeonhole ChangeLog is not available, yet" >ChangeLog
+
 %configure                             \
     INSTALL_DATA="install -c -p -m644" \
     --disable-static                   \
@@ -188,7 +193,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} %{_builddir}/%{name}-%{version}%{?prever}/docinstall
 
 
-pushd dovecot-2.1-pigeonhole-%{pigeonholever}
+pushd dovecot-2-2-pigeonhole-%{pigeonholever}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT/%{_docdir}/%{name}-2.1-pigeonhole-%{pigeonholever}
@@ -340,7 +345,7 @@ fi
 
 %check
 make check
-cd dovecot-2.1-pigeonhole-%{pigeonholever}
+cd dovecot-2-2-pigeonhole-%{pigeonholever}
 make check
 
 %files
@@ -413,6 +418,7 @@ make check
 %{_libdir}/dovecot/auth/libdriver_sqlite.so
 %{_libdir}/dovecot/dict/libdriver_sqlite.so
 %{_libdir}/dovecot/libdriver_sqlite.so
+%{_libdir}/dovecot/libssl_iostream_openssl.so
 %dir %{_libdir}/dovecot/settings
 
 %{_libexecdir}/%{name}
@@ -473,6 +479,9 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Wed Feb 27 2013 Michal Hlavinka <mhlavink at redhat.com> - 1:2.2-0.1
+- major update to dovecot 2.2 RC2
+
 * Mon Feb 11 2013 Michal Hlavinka <mhlavink at redhat.com> - 1:2.1.15-1
 - dovecot updated to 2.1.15
 - v2.1.14's dovecot.index.cache fixes caused Dovecot to use more disk I/O
diff --git a/prestartscript b/prestartscript
old mode 100755
new mode 100644
diff --git a/sources b/sources
index ed8d7eb..871baa5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8ce198c5ee22f4fe8ab525b9bd753d56  dovecot-2.1.15.tar.gz
-36a2a5dd68c18f28f653c44abb2e0e9b  dovecot-2.1-pigeonhole-0.3.3.tar.gz
+caa145f542e272fcb35ffa50681dd012  dovecot-2.2.rc2.tar.gz
+cf4a25c24cd2458314c8ed9d36dc2752  pigeonhole-99eec511aa2c.tar.bz2