[dovecot/f17] Revert "major update to dovecot 2.2 RC2" it was intended to master branch

[Michal Hlavinka]

commit ba62c0a3916a310d5a440774090b7b85e8eb9bb6
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Wed Feb 27 13:11:41 2013 +0100

    Revert "major update to dovecot 2.2 RC2"
    it was intended to master branch
    
    This reverts commit b8ff35d9d0d097fb911173b98b30eb8fa529e91c.

 .gitignore   |    2 --
 dovecot.spec |   29 ++++++++++-------------------
 sources      |    4 ++--
 3 files changed, 12 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 22e1c05..8a903d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,5 +58,3 @@ 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.spec b/dovecot.spec
index 4c5bb3a..5a1547f 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,21 +1,19 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 2.2
-%global prever .rc2
+Version: 2.1.15
+#global prever .rc6
 Release: 1%{?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.2/%{name}-%{version}%{?prever}.tar.gz
+Source: http://www.dovecot.org/releases/2.1/%{name}-%{version}%{?prever}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
-%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
+%global pigeonholever 0.3.3
+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
@@ -165,12 +163,9 @@ sed -i 's|/etc/ssl|/etc/pki/dovecot|' doc/mkcert.sh doc/example-config/conf.d/10
 make %{?_smp_mflags}
 
 #pigeonhole
-pushd dovecot-2-2-pigeonhole-%{pigeonholever}
-
-# required for snapshot
-[ -f configure ] || autoreconf -fiv
-[ -f ChangeLog ] || echo "Pigeonhole ChangeLog is not available, yet" >ChangeLog
-
+pushd dovecot-2.1-pigeonhole-%{pigeonholever}
+#./autogen.sh
+#autoreconf -fiv
 %configure                             \
     INSTALL_DATA="install -c -p -m644" \
     --disable-static                   \
@@ -189,7 +184,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} %{_builddir}/%{name}-%{version}%{?prever}/docinstall
 
 
-pushd dovecot-2-2-pigeonhole-%{pigeonholever}
+pushd dovecot-2.1-pigeonhole-%{pigeonholever}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT/%{_docdir}/%{name}-2.1-pigeonhole-%{pigeonholever}
@@ -319,7 +314,7 @@ fi
 
 %check
 make check
-cd dovecot-2-2-pigeonhole-%{pigeonholever}
+cd dovecot-2.1-pigeonhole-%{pigeonholever}
 make check
 
 %files
@@ -392,7 +387,6 @@ 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}
@@ -453,9 +447,6 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
-* Wed Feb 27 2013 Michal Hlavinka <mhlavink at redhat.com> - 1:2.2-1.1
-- major update to dovecot 2.2 RC2
-
 * Tue Feb 12 2013 Michal Hlavinka <mhlavink at redhat.com> - 1:2.1.15-1.1
 - fix location of systemd files
 
diff --git a/sources b/sources
index 871baa5..ed8d7eb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-caa145f542e272fcb35ffa50681dd012  dovecot-2.2.rc2.tar.gz
-cf4a25c24cd2458314c8ed9d36dc2752  pigeonhole-99eec511aa2c.tar.bz2
+8ce198c5ee22f4fe8ab525b9bd753d56  dovecot-2.1.15.tar.gz
+36a2a5dd68c18f28f653c44abb2e0e9b  dovecot-2.1-pigeonhole-0.3.3.tar.gz