2.0.21

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6667 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.0.13
+Version: 2.0.21
 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,10 +14,10 @@ Group: System Environment/Daemons
 
 # pigeonhole
 %define build_pigeonhole 1
-%define pigeonholever 0.2.3
+%define pigeonholever 0.2.6
 
 # pop before smtp (drac)
-%define build_drac 0
+%define build_drac 1
 
 URL: http://www.dovecot.org/
 
@@ -31,7 +31,9 @@ Source10: dovecot.tmpfilesd
 #our own
 Source14: dovecot.conf.5
 
-Source100: http://www.dovecot.org/patches/1.1/drac.c
+# 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
 Source110: README.plugin-drac
 
 Patch1: dovecot-2.0-defaultconfig.patch
@@ -163,13 +165,17 @@ This package provides the development files for dovecot.
 
 %setup -q
 
-cp %{SOURCE100} .
-cp %{SOURCE110} .
-
 %patch1 -p1 -b .default-settings
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
 
+%if %{build_drac}
+%setup -T -D -q -a 100
+mv dovecot2-drac/README README.dovecot2-drac
+mv dovecot2-drac/README.j README.dovecot2-drac.jp
+cp %{SOURCE110} .
+%endif
+
 %if %{build_pigeonhole}
 %setup -q -D -T -a 8
 %endif
@@ -217,9 +223,9 @@ popd
 %endif
 
 %if %{build_drac}
-%{__cc} -Wall -W -shared -fPIC -DHAVE_CONFIG_H \
-    -I. -I./src/lib \
-    drac.c -o drac.so -ldrac
+pushd dovecot2-drac
+make DOVDIR=../
+popd
 %endif
 
 %install
@@ -234,9 +240,13 @@ popd
 %endif
 
 %if %{build_drac}
-install -m 755 drac.so $RPM_BUILD_ROOT/%{_libdir}/dovecot/
-ln -s ../drac.so $RPM_BUILD_ROOT/%{_libdir}/dovecot/imap/
-ln -s ../drac.so $RPM_BUILD_ROOT/%{_libdir}/dovecot/pop3/
+pushd dovecot2-drac
+install -m 755 drac_plugin.so $RPM_BUILD_ROOT/%{_libdir}/dovecot/
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/dovecot/imap/
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/dovecot/pop3/
+ln -s ../drac_plugin.so $RPM_BUILD_ROOT/%{_libdir}/dovecot/imap/
+ln -s ../drac_plugin.so $RPM_BUILD_ROOT/%{_libdir}/dovecot/pop3/
+popd
 %endif
 
 # install -p -m 755 src/plugins/convert/convert-tool $RPM_BUILD_ROOT%{_libexecdir}/%{name}
@@ -447,9 +457,9 @@ make check
 %if %{build_drac}
 %files drac
 %defattr(-,root,root)
-%{_libdir}/%{name}/drac.so
-%{_libdir}/%{name}/imap/drac.so
-%{_libdir}/%{name}/pop3/drac.so
+%{_libdir}/%{name}/drac_plugin.so
+%{_libdir}/%{name}/imap/drac_plugin.so
+%{_libdir}/%{name}/pop3/drac_plugin.so
 %doc README.plugin-drac
 %endif
 
@@ -460,6 +470,18 @@ make check
 %{_datadir}/aclocal/dovecot.m4
 
 %changelog
+* Sat Jun 16 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.0.21-1
+- new upstream release 
+- new upstream release pigeonhole 0.2.6
+
+* 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
+- revival drac_plugin.so (POP bedore SMTP) support
+- use DRAC plugin for Dovecot-2.x
+-  (get from http://sourceforge.jp/projects/dovecot2-drac/releases/)
+
 * Sat May 21 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.0.13-1
 - new upstream release