rpms/dovecot/devel doveadm.1.gz, NONE, 1.1 dovecot-2.0-defaultconfig.patch, NONE, 1.1 dovecot.1.gz, NONE, 1.1 dovecot.init, 1.14, 1.15 dovecot.spec, 1.162, 1.163 dovecot.8, 1.1, NONE dovecot.conf.5, 1.1, NONE dovecotpw.1, 1.1, NONE

Thu Mar 25 14:22:30 UTC 2010

Author: mhlavink

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11342

Modified Files:
	dovecot.init dovecot.spec 
Added Files:
	doveadm.1.gz dovecot-2.0-defaultconfig.patch dovecot.1.gz 
Removed Files:
	dovecot.8 dovecot.conf.5 dovecotpw.1 
Log Message:
* Thu Mar 25 2010 Michal Hlavinka <mhlavink at redhat.com> - 1:2.0-0.1.beta4
- dovecot updated to 2.0 beta 4

--- NEW FILE doveadm.1.gz ---
‹¶¢K doveadm.1 µZ{sÜ¶ÿŸŸuÇS)=Q:=\ç¦N"YJr3Ö£:%q§Êhp$x‡ˆ¯  ¤kÓïÞÝ@‚§“-»gMâ#A,°ØÇod|õ#;>ÿùäðø”
Ù‹ÝáÎÖÎÞÖðõöþ;®îDR¶ï¼ˆâÉììðô$Ja”§»ÞbnÂõ_4ƒYJm7²*Ycd.Í"Š¯_lé8˜üóìüb2žD×Ù‘cä:»`ÿ‚Ûëã;¸þ•]gã¤*
^¦î‘¿½©jdNã¬(çjÖ¢4öÉºy>>™¼½_\ÏÏ¢øˆ9¶#©?.?Ç1Ûxÿþ=F”)+ÄŸØhk“m®Ësbp]ÍËª<¯îe9ùuÂc\	vÇs™Â4Åxž3'F=Šâ«$UD'%ŸæB³;¡¦•Æ³À–Ši3ƒShÍgBÇÁÝc‚“e’7)ðÁjUÍPÁ^Mi„ÊµKàíùééáÙñdÍOoÌøíL–F:»åx	æˆ£7ºJn…¹©9ÍøÕMy€ëÈO‘eVyKo´PÞÌk®õ}¥RkÅQ|qÚDùNM,á%›
”)33Bf@ë8	œ@&ÖQ»8<“w¢Œâñ%R(÷-„…fÁ“DÔF¤ÞÆÇØòÁ¢ø÷Nxê,aË»GXŠ8:Z€Ýd¼É-Ÿ?ßƒU\ú)ÀûN5e*ÕwÛ¸ÈV’KX(º—`žî¬qÀÔƒg
E¦©Ä
9šri¯5Û¸NpÝ’®ÞØ;0üo7[ñ,ñŒÒŒ£ïáaüÊ:ášÆªpîä•¡›º–ÓŽÊÈ‚dª¢‹Jk	¾A¼h¿3²ÓÄR¿œxUÝÉD²Ü5ÞÏe2_Å¸žWMž"/x’ÒyYÁô`nY`UÆ¸_u@î_•ùÂZÔ½Õ:`³‚¼€{G—L¼fº¬«zôP)ºÓ…©Y¹¬iÿ¼J at +ãÀÇ”ü·ª“¿¸#SŽL‰¢2¢Gg-â	º¼®”	6ÄÛñ,fÃý½võv–[?˜¶»ðêo €;yLÎBsÉCáój‹ò‹ýï°Ñymí„hÿ<q˜lð°¨M{? 3ceU
vÏµõÜuãä„¥MQ‡`†÷˜ffQRÌBD¢E<"A(ôhfxÏ6 at Pó yŠaOZpPžÊ`´;Œ‚:•%W”«,SñÁÊxr2™;ÇÔÈ§ÕC{˜!òáê8—îÐÌ»
= ¹F×gÞ‰…]Ò€ÛBU%a[ M…‰E/·2*ÊmÞ-c± çÆö$o¾¡%Ñ£h`ÐÞ‚7Ù¡Ö’á´ËÓc\A‚ÃžÌ‰e‰Ú†ÍUòx78 ý§{«:îX#"Bì R  äšÄ¼~c'âz6]”Ihµ½A$ý£’¼ñþ+–e0ø$R%M¡
/P³4„“s^×¢Ài¹!`srbÃMÌùJs(ø5‚0ú½®rˆ€à×ð´ÐFcB7€Ü5¼Lú'ô.å {.ò:kr ëóÖ˜ÉÊÛüf¦5hKaCJÕ
ºjY õiS)HÜ˜õ']y®+–Ì„âÔ¦mZÇ#ËæÔg‘˜!x~”’‚Î“iŠ[Ê€,Ñ/o‰
&+~a'V \•´9Z¦ˆÏ5¡2)t|vtþ>ŽÖnª¨«ÐBñ~©‚±™]‡¢DâÅQ+‰ È!xBF‡1:ÈÍI¥p ©à BÂ0Žr3¢6b¬`ñô¸¾“07½ÉNõ©ÔuÎ¤÷5‹ãV&·¡8ð~EÎ\ÞÉü‰¤9#qõ\{,Q¤øx~ÉÁõ-‘ü`@ô‰Ö¾_Süª vW4Ä«áW‡0µh-œìæow$0.e°‚|—°-(ÅvkõÓYÊ±—ÑÃÞåD'n~´+3kà$ƒ2Žœ•VêÎ.–‡äVX+Àÿ>ÙíÜV":u*³f•†•Â@fs«ÝÑé@¯ Ä }5¦« u—U;ô#;Vâ÷F*ÌLqóEÕ Dß‘ 39kð®
aæry‹ñW×Q\fk3gÊZÿ+rúµùäM.!î³7h<Ã¿–h;øÐÑÝPµ
OwÒÿFq&93è´ÓÄ³LÇ
ÔlÛ!hŠHDZ¡¯+/¦e£q6·d9cÛr@Ø®}m2…¹ˆéiÂ †,½M¶¶³‰“ÑàÙ6lUEº™jX%_eþùÉûÃÓ‹w'‘{²~€€06½1Â
=&¨ô”Ÿ÷pÖoõTÂŠ%æ§(>ã¥MšbyQF¤ÑRÕÅ!g„D^Ü›Ÿ*™COfkðd{hg¨ñ¶</i‘nCÜ‡áàÓ…-Yè5¼ì#Ú#÷É/!c ÞŽ/¡81öä¶¼Ìú’ìšm~CiÔLôÌœe<Jûzz'ÊZ¯¨»Eæ(ñÒû¶©5pÞG ÇäDŒëÈNJvîîSì0ej7î’/Kå²$mÕôâQÄå@žœà×°ôÊbÈj7^¿¸ï{²¾ï¼1w‘ÖÞÕNaÛÊ=Ò.kÈ*<húZ³Ã[?/çEÀÂ
¥ÍD)7]¹‘@Ï]aØF“Ý˜éˆòÌ®:¿Jf67ò«ÙUæÑ;LÀP[è#•Â9m©ÿhuñ r{Œbªç‹jÀ‚–”zŽÎlÄƒé5úd(hè´œRÒWV=Ê6í{ªÇ ±ßÊD—nC~ò¨G{"—r´'õÃ–³Ž¡G
ñL‚ZNKh³·—‡§[§ÇÝŽ}ô‚*G®lT’2Q&UžºÉ°
²Ui¨“8š´:[š-(ŽÚ6V<}µïÚXñ”kñjŸ@;µ#s¨jmëã%±37¦moßË[ûÊ¹R³íÃ^<Ø¾p§Ÿ7®eQ)øaÈ‘mti
ØrÝ
pB€ð‹K¶hüxüÃÉäª/;çËár°‡ì¬x*|Q0	ÇÁg¶š¢Ü¥æÊøºjÙ-¾w'X#%À¥AžÀ¬H‘Ú=ÄÍ(z¦ÀNE2ç¥Ô…Þ¶ËÁj+þì…Ð¥†²rV][Ò’Ñ./}Câ¤;¬}æb¹§ÅŒ Ž˜Á
«öD`Wy¥m	¢ƒÓ ÉÕ³®mjiëKÁñ¼3tzÄä#¶Æ@o»þ7E+ ÈC-zØ3Q¼Ø*R /}Wb×ýÿ"Ý˜ßÿat §"1Í„qc
ì/O–´]puÙ……)¦"–°É=Ð$¢Ê‚h}5„ßãO"õ…¶ÌAãSúx;ãÜË´ë~ì0vÓèòYç¿~Áâñ;«BH˜®ØSr&fù`µ³|aÇfy5å¹o¼ÜÔy¶¦¡0‘[·`‚móÊ®kgßÜHµ/ËÖøÚÍ_Cy×KBh÷Õ¹#"¡KÁ«Û¦Æ×éXM@¼Ù£¾!:u&m§Køú~+ÒÖ\Òé†ÞdjŠå·phØU>·®À7pv…g¾kËJ¶ô®’23ú‚šá‹/WêÃú<uvè uK9›üãK¹á´©'†˜	5ØO`/ï¸’ôz@Í ÔãK¹wT/sˆùýºøæ÷F¨…·ï8:WO÷B¾@ÜìXÇM(>…m7É6R
QÞ@Ò-DfzÀÕ1'c(¾±áõÍËw%Û&Ù~ùNÇ–¦ë:,½Ÿ:/óñÙv
ú‰¤cÄ™h—À9þm?ì'.·ŸÖô¶•}X#<¯ÌÇ½Ÿ*ñPœºö_\ÅÂjŽ]‚ Qår_ÛZ_Óî.ù¸ÆgOtë†ÑöŒ1¡C,I¯”è;¶…fM»{éÒ¿°¹GŸ©ª©mWÀ[Mï='ÙEþ=±¢2’ ›E‚Ý&ó0Ú}n‡j"¡égw«®>ÜžÔ"ÁRpUó£×ú<ê}ð(¶¥Bòr9¥A09¸8é%¼þ]üY¿Èw.Ô†õx›ŠN€5añTÚ>êŠ/&Hk¤úßªy9ˆ µšåÐRý_ò¿¶ûIí5¼ë^÷GÃ¯wãx7îï¹7Re¸ÄÛzð~ù†ƒ{%ë7-±Cÿè›¶®Å‹t:²Ïh!ªÞE
êrÅ!T‹?‡²Hþ'Zøý¯HœQ_ufn_|÷ÐLûN„~ä>]-G‡HöU´Á5 ŽÔ·›Ö1Aw;m˜€j»”ìºM¿6 
j×yWdž	¶È`ZÂ•
fÙÖýÆ¿Š<|°ÕµªÀ}ðB¦4 ëÞóè7^>EKÓQÕø÷¿£Ñp‰+ïgÐïîìáïîÎÎp”N_ö÷F»°Zx.RÑ”á…H{ÐÙšq÷5Aã(šrDÿ^! ¬ªþoÁO( ½üÍÒ¯Fû`à£½×S>í<{‰¯‡C’±÷©ƒ½OØ~wø*¤K×òÏw¶w÷?MÌ(Ì%gµ?ög'á
/¤ÙlCÖzóc§bCw°
”ê&Ûx,ÔÍ/€?²Ë“‹óË«ñÙìè§&P"°iƒ¯µÛï+1„Ùz£Ì /(#ÛþøÏ6ü—À§VQ~Ëÿî*”ï‚öÌ7ø¥ÂrŸGÑžH‡ÛRË¨-¹i[=a—&ZªxnŠ|ýŸŸœ°Ãw“ó Ð‚ƒC¥5X.½Ü }$‚•Øÿ ®$)3-  
dovecot-2.0-defaultconfig.patch:
 mail.conf |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE dovecot-2.0-defaultconfig.patch ---
diff -up dovecot-2.0.beta4/doc/example-config/conf.d/mail.conf.defconf dovecot-2.0.beta4/doc/example-config/conf.d/mail.conf
--- dovecot-2.0.beta4/doc/example-config/conf.d/mail.conf.defconf	2010-03-25 15:13:01.458494067 +0100
+++ dovecot-2.0.beta4/doc/example-config/conf.d/mail.conf	2010-03-25 15:13:01.459364459 +0100
@@ -262,6 +262,7 @@
 # them simultaneously.
 #mbox_read_locks = fcntl
 #mbox_write_locks = dotlock fcntl
+mbox_write_locks = fcntl
 
 # Maximum time to wait for lock (all of them) before aborting.
 #mbox_lock_timeout = 5 mins


--- NEW FILE dovecot.1.gz ---
‹-ôžK dovecot.1 Vmoã6þ®_AôËÚ!qÚ+0lÅv}M¯šÄˆÓÝ†y([Ž…“%Ÿ$7Í~ý(ÙNvÝpCŠH“"’,îàföëøz¶€8øp|r<<>žüp ø£žXª,|ŽHßÁôr2&Y+M†@Á°´Ö¨Ì à«Bl U2ç«ZÓ¥`N.#¯ŒfÑ)~¬Ÿ˜&Ar0ÜÓŸ*þ}:‹â0&I~Õ—äüÇdHoe…§?¡=§N•äaf2Ì¹`NOu2\Ö\dÉPU–+i¼i§*˜¨vB¡¦µÒ;.0IƒÆÛO5ŠfÛ£±Ê»Ù;7ãøzF‹p6%]í¸AüAUL‚QµNÿ¹&+
÷\ÖÏ£‡iøfÆ¿0b6Æ²Ò`¹µèaÍmÑ”œÛ
Tš—Ts¬9—Pr™¯neÏ)‚Ii¡8^ínY*ç£¤Bø Õ+†ŒE	õ˜$´Éwrjì /+ì$«ðbu5 Í¾Ö\3eK9EWÀÕÞ…÷Ì-©
~…ém@`è¥d¥Ò›`ïÈÏ<è1		®p4(¹©Ë
\–Ûð‘a–Ë•ñ	ÙLÕÖËž¹S§)3&¯…ÀCK.C‚pMkË<qî!hï
Áõ4@¿ŸIl©¶.vˆ/V„
Ë´ÄHžØn\ÁKè·d^Ë¾1VÇVZÕ2 ·QÄRò¿XÏT6YKìýaÆrZ»§„%ô®©H¤UYYßOÖY_v$5ft¶Ut9²=ºÏñ3âÊàª«žÓ×“OâB¡mh×Ž^
ö½zî[` ÛŸBmèÊµŸñ¿ÿ	EÏÍÇÏ8vÌ–;ö½íæ
hÓ‹°™ZKmmàÇŸvœ·Lõ&×Vþnx{ŸëÙdr9½ÙÎOC˜äV!_õ;3mT8Üæu.˜ôU.jÄv-SÁ‘{A2rÔaºš;ÒÌÉ¸®D…1¾žkÞŒ*Jk)r‡‡UaÑ»ÈÕºÆö–úQÚõ²d>pAlÑv¤07¡õsr;W>£ÂµX¥•Ãšáu‡çççoúS~$ßjT©êôÅ ‡€9ÒÁ˜ÎöÿÎ†Ÿ¦—÷ñ–ä]à¥¥\	¡Öˆ‘¯ _I*¡Á2©æK–u@Ü=DßXØÖ0œ.¾ÀÖv1žOþ·ñC<?y'dÿ®öI¾>p,là0I=‘¡ä±¢8„ä2W©chøŽ-ëÕVG 	¢ÈñbU×Ä—÷—óIgzQ	Å=?A¦Îö?¡·áý¸Ï.p1p	g\_ŒZ<ºßÀ)HJJŠïÇîèÐ	þÕ™ÙèûÆÛõk*‡Œç9Ón½pKî
ç½ë¾A˜£Ù|N?ÁÕÃ§˜ÌY¥´Åwa…+—©¨³v º—Ë?‰HóU‹LKÓÝôL(Žî‘‰àç6ñ‹E¥WqÂNÑe»Ò,Ý{¡ýÎÎ]ë÷¬'tä—mjÏHamu6õÜŒðÃÆ*(l)öÏ
ã1¶c<ó}éîÅUOŽ[GâEb62uGò7¶µÔˆ~  

Index: dovecot.init
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dovecot.init	25 Nov 2009 16:33:33 -0000	1.14
+++ dovecot.init	25 Mar 2010 14:22:29 -0000	1.15
@@ -35,7 +35,7 @@ fi
 RETVAL=0
 prog="Dovecot Imap"
 exec="/usr/sbin/dovecot"
-config="/etc/dovecot.conf"
+config="/etc/dovecot/dovecot.conf"
 pidfile="/var/run/dovecot/master.pid"
 lockfile="/var/lock/subsys/dovecot"
 


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- dovecot.spec	12 Mar 2010 09:25:47 -0000	1.162
+++ dovecot.spec	25 Mar 2010 14:22:29 -0000	1.163
@@ -1,8 +1,9 @@
+%global betasuffix .beta4
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.11
-Release: 2%{?dist}
+Version: 2.0
+Release: 0.1.beta4%{?dist}
 #dovecot itself is MIT, a few sources are PD, (manage)sieve is LGPLv2, perfect_maildir.pl is GPLv2+
 License: MIT and LGPLv2 and GPLv2+
 Group: System Environment/Daemons
@@ -13,35 +14,30 @@ Group: System Environment/Daemons
 %define managesieve_version 0.11.11
 %define managesieve_name dovecot-1.2-managesieve
 
-%if %{?fedora}00%{?rhel} < 6
-%define _initddir %{_initrddir}
-%endif
-
 URL: http://www.dovecot.org/
-Source: http://www.dovecot.org/releases/1.2/%{name}-%{version}.tar.gz
+Source: http://www.dovecot.org/releases/2.0/beta/%{name}-%{version}%{betasuffix}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
-Source3: maildir-migration.txt
-Source4: migrate-folders
-Source5: migrate-users
-Source6: perfect_maildir.pl
-Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
+#Source8: http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/tip.tar.bz2
+%global phsnap 940554ef4a55
+Source8: pigeonhole-snap%{phsnap}.tar.bzip2
 Source9: dovecot.sysconfig
-Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{ver4mansieve}-managesieve-%{managesieve_version}.diff.gz
-Source12: dovecot.8
-Source13: dovecotpw.1
+
+#http://wiki2.dovecot.org/ManPages/dovecot?action=AttachFile&do=view&target=dovecot.1.gz
+Source12: dovecot.1.gz
+
+#http://wiki2.dovecot.org/ManPages/doveadm?action=AttachFile&do=view&target=doveadm.1.gz
+Source13: doveadm.1.gz
+
+#our own
 Source14: dovecot.conf.5
 
+
 # 3x Fedora specific
-Patch1: dovecot-1.1-default-settings.patch
+Patch1: dovecot-2.0-defaultconfig.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
-Obsoletes: dovecot-sqlite < 1:1.2.10-3
-Obsoletes: dovecot-ldap   < 1:1.2.10-3
-Obsoletes: dovecot-gssapi < 1:1.2.10-3
-
 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
@@ -65,7 +61,6 @@ Requires(post): /sbin/chkconfig, /usr/sb
 Requires(preun): /usr/sbin/userdel, /usr/sbin/groupdel, /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
 
-%define docdir %{_docdir}/%{name}
 %define ssldir %{_sysconfdir}/pki/%{name}
 
 %description
@@ -108,70 +103,60 @@ Group: Development/Libraries
 This package provides the development files for dovecot.
 
 %prep
-%setup -q
-zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
-%setup -q -D -T -a 8 -a 10
+%setup -q -n %{name}-%{version}%{?betasuffix}
+%setup -q  -n %{name}-%{version}%{?betasuffix} -D -T -a 8 
 
-%patch1 -p1 -b .default-settings
+#%patch1 -p1 -b .default-settings
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
 
 %build
-rm -f ./"configure"
-autoreconf -i -f
-%configure                           \
+%configure                       \
     INSTALL_DATA="install -c -p -m644" \
+    --docdir=%{_docdir}/%{name}-%{version}     \
     --enable-header-install      \
     --disable-static             \
-    --with-libcap                \
+    --with-nss                   \
+    --with-shadow                \
+    --with-pam                   \
+    --with-gssapi=plugin         \
+    --with-ldap=plugin           \
+    --with-sql=plugin            \
     --with-pgsql                 \
     --with-mysql                 \
     --with-sqlite                \
-    --with-sql=plugin            \
-    --with-sql-drivers           \
+    --with-zlib                  \
+    --with-libcap                \
     --with-ssl=openssl           \
     --with-ssldir=%{ssldir}      \
-    --with-ldap=plugin           \
-    --with-gssapi=plugin
+    --with-docs
+
+sed -i 's|/etc/ssl|/etc/pki|' doc/mkcert.sh doc/example-config/conf.d/ssl.conf
 
 make %{?_smp_mflags}
 
-#sieve
-pushd %{sieve_name}-%{sieve_version}
-rm -f ./"configure"
-autoreconf -i -f
+#pigeonhole
+pushd dovecot-2-0-pigeonhole-%{phsnap}
+autoreconf -fiv
 %configure                             \
     INSTALL_DATA="install -c -p -m644" \
     --disable-static                   \
     --with-dovecot=../                 \
-    --with-unfinished-features
-
-make %{?_smp_mflags}
-popd
-
-#managesieve
-pushd %{managesieve_name}-%{managesieve_version}
-rm -f ./"configure"
-autoreconf -i -f
-%configure                           \
-    INSTALL_DATA="install -c -p -m644" \
-    --disable-static                 \
-    --with-dovecot=../               \
-    --with-dovecot-sieve=../%{sieve_name}-%{sieve_version}/
+    --without-unfinished-features
 
 make %{?_smp_mflags}
 popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-%if %{?fedora}00%{?rhel} < 6
-sed -i 's|password-auth|system-auth|' %{SOURCE2}
-%endif
+pushd dovecot-2-0-pigeonhole-%{phsnap}
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
 
-install -p -m 755 src/plugins/convert/convert-tool $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} %{_builddir}/%{name}-%{version}%{?betasuffix}/docinstall
 
 install -p -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/dovecot
 
@@ -179,13 +164,13 @@ install -p -D -m 644 %{SOURCE2} $RPM_BUI
 
 install -p -D -m 600 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dovecot
 
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man1,man5,man8}
-install -p -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man8/
+#install man pages
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man1,man1,man8}
+install -p -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man1/
 install -p -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_mandir}/man1/
 install -p -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_mandir}/man5/
-find $RPM_BUILD_ROOT%{_mandir} -type f -exec gzip '{}' \;
 
-# generate ghost .pem file
+# generate ghost .pem files
 mkdir -p $RPM_BUILD_ROOT%{ssldir}/certs
 mkdir -p $RPM_BUILD_ROOT%{ssldir}/private
 touch $RPM_BUILD_ROOT%{ssldir}/certs/dovecot.pem
@@ -197,31 +182,18 @@ mkdir -p $RPM_BUILD_ROOT/var/run/dovecot
 chmod 755 $RPM_BUILD_ROOT/var/run/dovecot
 chmod 700 $RPM_BUILD_ROOT/var/run/dovecot/login
 
-# Install dovecot.conf and dovecot-openssl.cnf
-mkdir -p $RPM_BUILD_ROOT%{ssldir}
-install -p -m644 dovecot-example.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot.conf
-install -p -m644 dovecot-example.conf $RPM_BUILD_ROOT%{docdir}/dovecot.conf.default
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/dovecot-*example.conf # dovecot seems to install this by itself
-install -p -m644 doc/dovecot-openssl.cnf $RPM_BUILD_ROOT%{ssldir}/dovecot-openssl.cnf
-
-# Install the licensing files into the documentation area
-install -p -m644 COPYING* $RPM_BUILD_ROOT%{docdir}
+# Install dovecot configuration and dovecot-openssl.cnf
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d
+install -p -m 644 docinstall/example-config/dovecot.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot
+install -p -m 644 docinstall/example-config/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d
+install -p -m 644 docinstall/example-config/conf.d/*.conf.ext $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d
+install -p -m 644 doc/dovecot-openssl.cnf $RPM_BUILD_ROOT%{ssldir}/dovecot-openssl.cnf
 
-mkdir -p $RPM_BUILD_ROOT%{docdir}/examples/
 install -p -m755 doc/mkcert.sh $RPM_BUILD_ROOT%{_libexecdir}/%{name}/mkcert.sh
-for f in `cd doc; echo *.conf`; do
-     install -p -m644 doc/$f $RPM_BUILD_ROOT%{docdir}/examples/$f;
-done
-
-install -p -m755 -d $RPM_BUILD_ROOT%{docdir}/UW-to-Dovecot-Migration
-for f in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}
-do
-    install -p -m644 $f $RPM_BUILD_ROOT%{docdir}/UW-to-Dovecot-Migration
-done
 
 # fix encoding
-pushd $RPM_BUILD_ROOT
-for fe in ./%{docdir}/auth-protocol.txt
+pushd docinstall
+for fe in auth-protocol.txt
 do
   iconv -f iso-8859-1 -t utf-8 <$fe >$fe.new
   touch -r $fe $fe.new
@@ -229,29 +201,17 @@ do
 done
 popd
 
-mv $RPM_BUILD_ROOT%{docdir} $RPM_BUILD_ROOT%{docdir}-%{version}
 mkdir -p $RPM_BUILD_ROOT/var/lib/dovecot
 
-
-# sieve
-pushd %{sieve_name}-%{sieve_version}
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
-# managesieve
-pushd %{managesieve_name}-%{managesieve_version}
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
 #remove the libtool archives
 find $RPM_BUILD_ROOT%{_libdir}/%{name}/ -name '*.la' | xargs rm -f
 
-#prepare the filelist
-(
-    find ${RPM_BUILD_ROOT}%{_libdir}/%{name} -type d | sed -e "s|^|%dir |";
-    find ${RPM_BUILD_ROOT}%{_libdir}/%{name} -! -type d | \
-        grep -v 'dovecot-config\|lib90_cmusieve_plugin\.so\|libdriver_.*\.so\|libauthdb_.*\.so\|libmech_.*\.so';
-) | sed -e "s|$RPM_BUILD_ROOT||" >libs.filelist
+#remove what we don't want
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/README
+pushd docinstall
+#rm -f dovecot-initd.sh dovecot-openssl.cnf Makefile* 
+rm -f securecoding.txt thread-refs.txt
+popd
 
 
 %clean
@@ -289,67 +249,112 @@ if [ "$1" -ge "1" ]; then
 fi
 
 
-%files -f libs.filelist
+#files -f libs.filelist
+%files
 %defattr(-,root,root,-)
-%doc %{docdir}-%{version}
+%doc docinstall/* AUTHORS ChangeLog COPYING COPYING.LGPL COPYING.MIT NEWS README
 %{_sbindir}/dovecot
-%{_sbindir}/dovecotpw
-%config(noreplace) %{_sysconfdir}/dovecot.conf
+
+%{_bindir}/doveadm
+%{_bindir}/doveconf
+%{_bindir}/dsync
+
+%dir %{_sysconfdir}/dovecot
+%dir %{_sysconfdir}/dovecot/conf.d
+%config(noreplace) %{_sysconfdir}/dovecot/dovecot.conf
+
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-checkpassword.conf.ext
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth.conf
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-deny.conf.ext
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-ldap.conf.ext
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-master.conf.ext
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-passwdfile.conf.ext
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-sql.conf.ext
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-system.conf.ext
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-vpopmail.conf.ext
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/imap.conf
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/lda.conf
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/lmtp.conf
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/logging.conf
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/mail.conf
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/master.conf
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/plugin.conf
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/pop3.conf
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/ssl.conf
+
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/dovecot
 %config(noreplace) %{_sysconfdir}/pam.d/dovecot
 %config(noreplace) %{ssldir}/dovecot-openssl.cnf
+
 %{_initddir}/dovecot
+
 %dir %{ssldir}
 %dir %{ssldir}/certs
 %dir %{ssldir}/private
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/certs/dovecot.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/private/dovecot.pem
-%{_libdir}/%{name}/sql/libdriver_sqlite.so
-%{_libdir}/%{name}/auth/libmech_gssapi.so
-%{_libdir}/%{name}/auth/libauthdb_ldap.so
-%{_libdir}/%{name}/auth/libdriver_sqlite.so
-%{_libdir}/%{name}/dict/libdriver_sqlite.so
-%{_libexecdir}/%{name}
+
+%dir %{_libdir}/dovecot
+%dir %{_libdir}/dovecot/auth
+%dir %{_libdir}/dovecot/dict
+%{_libdir}/dovecot/doveadm
+%{_libdir}/dovecot/*_plugin.so
+%{_libdir}/dovecot/*.so.*
+%{_libdir}/dovecot/auth/libauthdb_ldap.so
+%{_libdir}/dovecot/auth/libmech_gssapi.so
+%{_libdir}/dovecot/auth/libdriver_sqlite.so
+%{_libdir}/dovecot/dict/libdriver_sqlite.so
+%{_libdir}/dovecot/libdriver_sqlite.so
+
+%{_libexecdir}/dovecot
+
 %attr(0755,root,dovecot) %dir /var/run/dovecot
 %attr(0750,root,dovecot) %dir /var/run/dovecot/login
 %attr(0750,dovecot,dovecot) %dir /var/lib/dovecot
-%{_mandir}/man1/dovecotpw.1.gz
+
+%{_mandir}/man1/doveadm.1.gz
 %{_mandir}/man5/dovecot.conf.5.gz
 %{_mandir}/man8/dovecot.8.gz
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/dovecot
+%{_datadir}/aclocal/dovecot.m4
+%{_libdir}/dovecot/libdovecot*.so
+%{_libdir}/dovecot/dovecot-config
+
 %files pigeonhole
 %defattr(-,root,root,-)
-#%{_libdir}/%{name}/lda/lib90_cmusieve_plugin.so
-%{_bindir}/sieve-filter
 %{_bindir}/sieve-test
 %{_bindir}/sievec
 %{_bindir}/sieved
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/sieve.conf
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/managesieve.conf
 %{_libexecdir}/%{name}/managesieve
 %{_libexecdir}/%{name}/managesieve-login
-%{_mandir}/man1/sieve-filter.1.gz
+%dir %{_libdir}/dovecot/settings
+%{_libdir}/dovecot/settings/libmanagesieve_*.so
+
 %{_mandir}/man1/sieve-test.1.gz
 %{_mandir}/man1/sievec.1.gz
 %{_mandir}/man1/sieved.1.gz
 
 %files mysql
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/sql/libdriver_mysql.so
+%{_libdir}/%{name}/libdriver_mysql.so
 %{_libdir}/%{name}/auth/libdriver_mysql.so
 %{_libdir}/%{name}/dict/libdriver_mysql.so
 
 %files pgsql
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/sql/libdriver_pgsql.so
+%{_libdir}/%{name}/libdriver_pgsql.so
 %{_libdir}/%{name}/auth/libdriver_pgsql.so
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/%{name}
-%{_libdir}/%{name}/dovecot-config
-
-
 %changelog
+* Thu Mar 25 2010 Michal Hlavinka <mhlavink at redhat.com> - 1:2.0-0.1.beta4
+- dovecot updated to 2.0 beta 4
+
 * Fri Mar 12 2010 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.11-2
 - fix missing bzip2 support in zlib plugin (#572797)
 


--- dovecot.8 DELETED ---


--- dovecot.conf.5 DELETED ---


--- dovecotpw.1 DELETED ---

