dovecot: new upstream release 2.2.10

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8161 ec354946-7b23-47d6-9f5a-488ba84defc7

d/dovecot/dovecot-vl.spec

@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Summary(ja): Dovecot セキュア IMAP サーバ
 Name: dovecot
-Version: 2.1.10
+Version: 2.2.10
 Release: 1%{?_dist_release}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2 and BSD with advertising
@@ -14,17 +14,17 @@ Group: System Environment/Daemons
 
 # pigeonhole
 %define build_pigeonhole 1
-%define pigeonholever 0.3.3
+%define pigeonholever 0.4.2
 
 # pop before smtp (drac)
-%define build_drac 1
+%define build_drac 0
 
 URL: http://www.dovecot.org/
 
-Source: http://www.dovecot.org/releases/2.1/%{name}-%{version}.tar.gz
+Source: http://www.dovecot.org/releases/2.2/%{name}-%{version}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
-Source8: http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-pigeonhole-%{pigeonholever}.tar.gz
+Source8: http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-%{pigeonholever}.tar.gz
 Source9: dovecot.sysconfig
 Source10: dovecot.tmpfilesd
 
@@ -33,13 +33,14 @@ Source14: dovecot.conf.5
 
 # drac plugin (pop before smtp)
 # Source100: http://www.dovecot.org/patches/1.1/drac.c
-Source100: http://sourceforge.jp/projects/dovecot2-drac/downloads/53176/dovecot2-drac-0.1.tar.gz
+# Source100: http://sourceforge.jp/projects/dovecot2-drac/downloads/53176/dovecot2-drac-0.1.tar.gz
-Source110: README.plugin-drac
+# Source110: README.plugin-drac
 
 Patch1: dovecot-2.0-defaultconfig.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 # local filesystem rules
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
+Patch4: dovecot-2.2-mkcert-10years.patch
 
 Packager: iwamoto
 Vendor: Project Vine
@@ -166,8 +167,9 @@ This package provides the development files for dovecot.
 %setup -q
 
 %patch1 -p1 -b .default-settings
-%patch2 -p1 -b .mkcert-permissions
+%patch2 -p1 
-%patch3 -p1 -b .mkcert-paths
+%patch3 -p1 
+%patch4 -p1 
 
 %if %{build_drac}
 %setup -T -D -q -a 100
@@ -212,7 +214,7 @@ make %{?_smp_mflags}
 
 %if %{build_pigeonhole}
 #pigeonhole
-pushd dovecot-2.1-pigeonhole-%{pigeonholever}
+pushd dovecot-2.2-pigeonhole-%{pigeonholever}
 autoreconf -fiv
 %configure                             \
     INSTALL_DATA="install -c -p -m644" \
@@ -236,7 +238,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %if %{build_pigeonhole}
-pushd dovecot-2.1-pigeonhole-%{pigeonholever}
+pushd dovecot-2.2-pigeonhole-%{pigeonholever}
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 %endif
@@ -286,7 +288,7 @@ install -p -m 644 doc/example-config/conf.d/*.conf.ext $RPM_BUILD_ROOT%{_sysconf
 install -p -m 644 doc/dovecot-openssl.cnf $RPM_BUILD_ROOT%{ssldir}/dovecot-openssl.cnf
 
 # Install pigeonhole conf
-pushd dovecot-2.1-pigeonhole-%{pigeonholever}
+pushd dovecot-2.2-pigeonhole-%{pigeonholever}
 install -p -m 644 doc/example-config/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d
 popd
 
@@ -360,7 +362,7 @@ fi
 
 %check
 make check
-cd dovecot-2.1-pigeonhole-%{pigeonholever}
+cd dovecot-2.2-pigeonhole-%{pigeonholever}
 make check
 
 %files -f libs.filelist
@@ -477,6 +479,11 @@ make check
 %{_datadir}/aclocal/dovecot.m4
 
 %changelog
+* Thu Jan  9 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.10-1
+- new upstream release 2.2.10, pigeonhole 0.4.2
+- drop drac (Pop Before Smtp) support
+- add patch4
+
 * Thu Oct 25 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.1.10-1
 - new upstream release 2.1.10
 - new upstream release pigeonhole 0.3.3
@@ -491,7 +498,7 @@ make check
 * Mon Oct 31 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.0.15-1
 - new upstream release
 
-* Tue Sep 28 2011 Masanobu HAGANE <masanobu@hagane.jp> 2.0.13-2
+* Wed Sep 28 2011 Masanobu HAGANE <masanobu@hagane.jp> 2.0.13-2
 - revival drac_plugin.so (POP bedore SMTP) support
 - use DRAC plugin for Dovecot-2.x
 -  (get from http://sourceforge.jp/projects/dovecot2-drac/releases/)
@@ -588,7 +595,7 @@ make check
 * Sun Feb 01 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.1.10-1
 - new upstream release
 
-* Sun Jan 12 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.1.8-1
+* Mon Jan 12 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.1.8-1
 - new upstream release
 
 * Sat Nov 01 2008 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.1.6-1
@@ -842,7 +849,7 @@ make check
 - add UW to Dovecot migration documentation and scripts, bug #139954
   fix SSL documentation and scripts, add missing documentation, bug #139276
 
-* Thu Nov 15 2004 Warren Togami <wtogami@redhat.com> 0.99.11-2.FC4.1
+* Mon Nov 15 2004 Warren Togami <wtogami@redhat.com> 0.99.11-2.FC4.1
 - rebuild against MySQL4
 
 * Thu Oct 21 2004 John Dennis <jdennis@redhat.com>