From 7aeead928a3be2854aa93a89c4018e55af93aacc Mon Sep 17 00:00:00 2001 From: Gerd von Egidy Date: Thu, 27 Jan 2011 19:25:56 +0100 Subject: [PATCH] - use wvHtml instead of catdoc by default: it retains formatting - don't disable the file types we now have helpers for --- mnogosearch-3.3.11-2.src.rpm | Bin 3901669 -> 3901928 bytes mnogosearch.spec | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/mnogosearch-3.3.11-2.src.rpm b/mnogosearch-3.3.11-2.src.rpm index 539557cbcd96e951596599ef14b876a49b550e66..eed4c297f028fdceaf52db4cbea88ade15e70167 100644 GIT binary patch delta 9712 zcmXZgb97zL+c)62Nn_i#ZQHi(?8dh3MorS#wrw|N^Pb=He)n3}y63a+nOXbK znSGRa4St$@4W7^|!O3OD!f9p3!@J0YR+ZO!*0&T!)0l1#%00I z0rtO#KXNv{|HXZn5=bg>ezTVYW}gZs;QEjZ1x|*9iUXP;4Dt;O3>CJS0~`qgh{6xb z;9y`-(x3_j28N;ms?eaJ%zxSDzbp%?u%N#Gf7#%_e&~PM@V|b>f7$52`~a%|+us6I zVLrU4<`#tHzr3WTQ(<9 z6HLJABst|<83ZSGvH&aV^8j2j6!1GEiHEx- ziI=Agz|n!k*2x`UX=*{@Y(-*j3b1fCCo%IOv9Po<^>6_2k=O!A+$;g6ph+ZF&TfvT z0D!HNHE071XD4a^iG{7ZshNW%3BbmZ#LD)610NSlcM>m45+`Rb5*t%bOA;GP2Nz4X z|62{lNaE<^Y~5^#WC{(<$;QRW6Ec7vF@O#Z0s#UE0tEsM0t5051QrAi2VnqV1YrVU24MkV1z`hW2jKwW1mObV2H^qW1>tKOK<9^02jYLz!H~v| zdt^{GzodeX4079?b1VR;-kwUbHf&zG(tEXyToWmZ6c6IbGc*pO$zNic-!MK!GR|e# z#6}Aa8=1ZCOkQ(FQ;q@siQD+^kEgP^>t_t^xpI{$fgPghfxI%PnK(LLqv=P=%>!)l zad^Ue6SIpxYs8N6YuYFEKQ1gFE6ScVFKOW+qGqx zuse4D9odqqUyZbQ1TG2iZ*|x=&oP!#5(Zx=BKvYS2kJ^|YcDAAyhGUd z{BNupapWo2$V$3h5J>FRK0P=3n4D};Ph9WQbJra75_h6?!@%fd(CpzT zmvu?^Y#{pL8K?NM`%pIw{)-(3DL2if{^~6TI$8^w`0|Bbr)f{Uu3-11JA1xKs3TzH zt0nRBvfNbcV6DHH9g+F+bRi0;{@YXd!rXs0VAeWB3&wb&8tB;mvT{5OjCWE$_;pfU zs2qsD?v*Ile7{2mA zm!gxw`6c)B6`*7H`FZpFR&nsj7Ox+7M`GY<&mQ6-yOJkiseG3~%e49AusfvF;?%@e zo7HrCg{EhEs{Oektd~NdD|6eV(1mSWpSB)@zNSNdt)t6An^J-G+}w)sLu~%;M#-hg zTdAS%GkI?P5*?FK;uXrn`JMDm+8-rf0u`?TYm&krzw?}}pOLAUKd(&QW`AX;Q9tV~KkwyN=1DW%xf^>+Dcb|cuFg95 zUHkIKrGSS|hFN=y_Ggi^m$tttcJh?8x4S4z^@)-FUcH@T-i@sY5t)64q{r=C?~DT0 zmnLM8^w`rTTsJS0-JUB;zP2mo{hF>9jwL;=H(GKV|79urGUHJ(KmL%Oj(G6^Kp7uxEFVS6N@G&OQ7vQ6@F8tO! z_I@}vACB1hxTC*bxAartIUmWw3E5ou!{n|BG4SfAGj5N?VQQT&HkyAPgIt_Zr$S@J z`(JBE0_%@cCVQ6)=`=bacJH+UU&>}8<@i7Ahv|Mt$Pt3}VohO=Zyg>8w!aGgO!OHO zb}|9GHeM~%XJ*UUpA4Igfeh+TZ%f_mZ84HDi^SU;?-E?L=g=04s?-Ch4)~>GS zw%@6~ltQm{iBy-lJ{`td-1bS&R_*%#{XV$%c)9oPt0W%1qQ!m>8PXEu?v;E942?UC`erW6@)TdD#222R2vv zFk~9ipROkU4EGSu-@5F}{L|z7W^wTpCeC#8ukLB}#wm@)D?aYVn9qK%i6ZAZ6w)-qY@dqhcbSeq-2?QU3Kq=g-<2ax-3qVwxq zNzF{tPnDH_83Q*0`OVpkSC%U;hXN7JwsKg0bd5zA!Mw+3Hkw+UGv16mbt_{jtm|Ds zf8Gu_D(hi(ool=QC7bC9XSCOw_U83lNg@jU@!30JZ8MWqbG}z4Z^<|kj!gV9{ueMG zS2{PAex1*_@X>QA@g5IpZ{f|n=|+D7KM+MpuEbBp#YNB{@84lD)uYKO+G45-lwFMB zWi^#Y-y(*IWvCOrsHPs%tvw#IIbg?roS2|Dt`h+3IGoC-tOp=lwb`?VX)|2Tv6N}+ z3}`YPmbV4kHh!GNFt^qc|M6B?h+=%_{O+WFj?sR1a{9D^{=96*Nm=0!_ov)X`kCq= zH-FRURcFqx|Mqi0FkL{w2qn1y_-cC)v@$d$%&@B6d>yesTyJ>4S$yO+@E64gx2@K6 zOE&Jf-jS_adg3r4`QEpMPrzqL@v}uZZR?|j-G^V3-)nf-awvKvAg}4_U(VeK-WMgk zTs-D)j&{Mbm%RRFPR~-I40ph~v3B_l0n72)LHR~j>X+b*<3MK+Og-%vkdV3H;B2~t zwSG+#^4$2h6>+*dYjO%(^iTuXv*gV%ZLt;+geGMEmuXSAH5{>o+{%F~_y_ zmjj`*L_{*}NoN<0vPgXapW4Qae~6z*qwYvw^MY3^##j0^M&6CD!6(uOtETGTPFkuT z?X-N%SD>e514+H?W|G1gfO&+%UWc89Cq25>ZH}k06Zr~%<7!c7tRCa1*3;2)SSH`^ zq~F(lYKhx?#kT_=OSGh!9(=O=e)}c6l&d>F8)r=Mrl-y*UwH=Fn+_N20wR+&4qO1` zJCjPToaW!z%#RuWBt0HY3rghQ9KPox>)$`dUo@MqP}dkYo~^Q;0TXa1qYtwuN@~ZJ zk;_{*0|j&KI!|RsDt^vT{d5w4(0+N4Bbv3b8AyG6qB7X|)DEdJbd!uj&2<*~t`#e^ zwEr|U3)Y7IjQ4Q`Jc(*yzpoD1E6Ai@@HI3(Ue7AKp+=j@C+so={8I=~-q;2((j{(p z{XW}F!(={feFolafX)^N(3ZSRPL9Pwz`xxW$v@PA8?y{9J0I>t_t`0PhimgpmBt;M z+m&hx9qzY#m!30a2F&N{RR&)UkMU{d>kqYGde=Llb9sWiq;qFWk8me?$Ie%Nqm3<3 zdCb7e0Ops`j9oq;w$ne?F=pefQ+|gK^&d^HgwjG6a}&cSK<3|Sl&U{F<;Ip{mg`^c z7Ed4--aaw7mYZ9YCy$dBR_2j~^RrJ4yo=KJjY2Ne?T+Jk0Oz{9e@{OynOMnxKIAm` zE)1!`0SrE1c=%n zKQA9i`@T~K0`EsUaNBwea)<+bbb9BzCzkWu{8;B2rt9qIa((6h8R2-}9?!7nIx88Z zZ9Dt--uvx65lbpg1(t35$ShIl>1(wfyjFB#f6Vx6u7@sT=5_J6F2|43gEzPL?_R(k z2J9APH};ov%=JCquS|>P6^!t2vpxWPVNqXil}Yhj>o(We4yNwWlIoY;KmS|p z@-PauzC(WWUE$rw-x|MGc?*k7^`DK5hzUf@ZGM{*^%U=zS>xP>i@G9HVsIKn$UF7f zx6MZT?W*rVO^pXCY1Jv z3I6UTe_gWYjsG_yX~2mf;UaKy-dS&xhxMwNe?u*ODx=kZcBy(`IMrKFaY>cDRWPPI zncs1~AXlHCF`(<$59Mm&e8f>3j%w8_P9;Z*_hcnWVvo-^e+57#%+#o>}1UqfCSv1Xlt7iU=#n2G)e%X_ZwFi3aqdh4=*DLKa)hysqY+ljE;`3F5Cs->k*#U$Hy_+Nry2HQtd}Yx7=1ACxx$SA%;;9{B+> zFoB78(y{~2$s^nz1_{|8F?9#=Te|FMe}L8^WNSeU$rJB>_5qtuU=YyD0)%aqAOj($^50oGpc9Hgpo?DnL0 zR{VJ{CHni4l4QP=pZG6%o7_fT_UgHFKCTP*MrGOBCKeH+0!ulKIdd-`H?TMKnStla zH$eoEjzqA3AI7G+WA6N=+}U3L4*&eJS~MZPPvw!onb+Y|bYEMHM4or0 z$B>&VU^PNb+e5j*6@mOh;y;hLqpRDP-m^8*CU|w@@DgBr#h;&|nBjEu+k@t$wUBG; z&g8worg1aVe!X-O=OC&CTvD>6Wv;xaEmFXi_23hqV3Q6M}#+Y$1mmnVf1d^z1(c0rRdZu8N+Nf;gBM`nxr51FUIE49v_NcGij;}c5IB;Ah_o_%AaX3R781dDDJ*5> zk{TTuIWZ~pyiS_hU1(zQYMvDtMkqssg{2}DTq2IZ`IQV5%l)lExF#xr@*T&>f?T``J3}8XJ3Fnn<-?5#hFH+B z{3YFK*4_8q=eFvKK=mxA7v;pMrl)JSI63(zYe#`Ho-Dw`-x-Me?Pkm3 zg;)#y9$kQBDH0f~{nCsuVE%}{)V!~BuoO}>PjV8Erp&u13Frqdi}>ovqN)jkZ&|f! znxar>`6o>T9Nm~Dvvqo#Ncp^achTnyRPCc%7o>Q4DrM?Xg)E}M#F55v%t-h)tzj!8 zst55nQ%9<8V)3?1f~UZuept!P`~b+R)=x2n6=C81P`1-kt|V|^g($T#k&G=nu5uYO zOsuNJVbK>5t-7hgKcHxt@sNPjVTvv1@*Xg9e?K@w zRhX@imYsd!#OR5TO)I`pp#JJ2ML4HRSq0ewhc6BlGg%boz_?~5-CJmRlBLWtk5_!RVGmI*w$HEm_=8_y`~RU>bILd!mq& zBup@AZqPii3K|M^i=zvANV4E=*`biOB&k5Wad29~3Q8U9St)z_tSG32U7W-HM~w4t z*|8B2Bs`WP)2hA~YdG-{XSZn?o&#bGwuiV~%9EnP5 z(ymJn5PDhlP8F)kC$wV0!PRF{8!2!!H|<+F+JIe)KuRT3gr9kW%5R? zW4&z))OAW(%pG=lf<+reZ(d$(xIcua<6y;SM%5ofyx=Oxo5Y+#(|)iJa7hDW3~0}} zC^;oy+HEYb3X#^WNR$@k63C|z*~yN(C4@lhEgzXuL8 zQNyB)_e;RJkYf~JkqqcckWJl5g_}#T^!d3ZnV=mha-d0ZlcgNq9pG>(!`4SiC70-- z%F{K|bjy^&@MIHUMx`NrQQ80{{B7I>jxmsbwAkW8uwg7W_?kfI;Oan;4L}8b@<2Yt zNPf3pByAo#!KcZfQenm;iR^)6teoLU%1lv!t0WjikSI&sPZ$zE@IWZx54@8TL8B~& ze5d!eYWZw2s^kn7g>Gs=kl{#k)ge>>Q@6!QW9sc~JtViCO?*Woo#zB55JZsq(GKzm zl&F(PmQ_H)Ly$Uk1rY?@-8m-8OB`OK;jcm8u{?*mE?@SwM!TR!N=HXp;7r8v8UZ|# zVZ%qJ#v|J^8H2Meh3A4L*dd^Jew2?v#FNHMYkuz|bIp)e7rQ3sTa(*U&Ou2CJ9oE% zg_=bgpM-Su(9EDTf|LhxPQjyrgR@;CxtZ=Gl-;V$;@Z6Ja@j<(@BN_ugkO8x2!yW)f9+v!nB#XL&If>(7fEfotil||cbuc-=|2V(GOx~V6a zXdLvaoEL^M>_lmyyEW{9&J$qOKin$EQE?tR3yf$pMSt&~?H~b>39(ctX?noUC2V=C zs=(Dwxdz~I34@obZ9Kvh#Xsr-CseGoIZsSSbjC?s`!f+pr=&VemQcBa%(TfwJ>yDM zCM9K5RR_n^R^*1D(JL_!IPF4n#)yNBC-f5)Q-=}aCtG0Yg|r|eyHTs;RLI&D#Z^oB z5^QtE0N+CxoF##pV(Pva$OV!%nUhuepX8W(wu#ZZy)rw|U@#WlYtglQA=*P!CG40R zDhc{4va$Kticjh1MxKkLAyxz(`^jvwO3bgpUxvcD+2 zC5XDPOJI0B4*=mDxq9+eZZd+TgS7<7%R~_BJfp*u z3_g3YQcr;tVW%nS?KGNPB^oMp$!z39T9A(WEJgg2ak8^VyYux~GSabPy{FKSrSdAh z41G%&CN-xauu_hSkx<%EHvO6OgFd8M{Ml~o)|&DRP>i||Kj<(o;-Q@{WYCu3e)8H{H@rS zr4)Iictik?3}1cq(soB;!!i0p=^N1$L2-7!3yOIyc$ivR3o^`+S^|+dbqt4ML^R56 zF0v?){*=ffxJXN!&ZfJaX7mGg9xZVcz!Qp<(*oJ#&6X1CNi9)*=6tv`&xABfy=bKp zw$mALx+^L}`29=S=Brt-Rw7@tv{k|;Lns7GlZif%U=p+VT*p6%da-uL1&<3* zPEI}}Q(1#bwt@#tP_yPDpXBuq^H}epTFnpO4~}}gB!WS-UHp}YK%IZpl3}w1r{u}< zC7x~(ws3#5rFMMukp6^>XKy^(4YNt%kRdfZd?0xD zn6D%MCvxvFEt*+~xL|aZe&Zn`L(4WN5HPq`m!zw_dvWEM*V}wb2&3;jz^@bo|HSt2 z7CzP;y^R|-Rf&kjXVTqLh0K>Iwih7no)iD{^B~TS^PEl0Cbqk~Qh!`kE=ST@MGg%P z0+ud%LX{H66WvnoHEp-|m`5oJnTRs&9^hRJPjgYSn!>9q^{TDYl(A6oXd&hT9G<7c z05+dSj>%1w%Ia~`Isx!+aakMGN!8Y9bg1KJs}*b_XAfUids{{m8b*6v0Oq7kc5na` z@DN28RLtEf*-XMvUB~9a$UxV>346O36=rgwFGtt^>d>IN0NS#>sHou1Ax()$ddld6 zzM*ve6kAa$q$(}b_l&71dtEv}GpE}&UUh2~!*smcY6)ABpQlbL)LxeXbHcisYxGzufKZ5{%EA=g_VFW* zRktKnDD@_(?xRHs1_=0$#L8f%JzVmJS;8XCLXl8+I&c^?QWMI$52{e0MCp*YRt^lD zmW)izAId&C?!&72YFtKlzi&LsP&A{t?I`Mk3YDcY0i2oq6&aR5y6wk4E5dwvIgu}w zHxdFhy@53&(caI~wWWlLLkI~isf3&Dh{-3^f|%dcz~M!|~>%PIxtnhGmDT zn{>7$bjqJ1kbM}%SNl0kUTsB3>`KqTk!#|UQvGc^tcN>%8fNTG!a1T|b% zT8l^{--i}uWJY6ZZoyF)+){F+CQ6cq+fW&V`8m?86gI&jn~|7${H&diV+6P&%$TDx zB2+9EVCpHZPh|x?)7nR3Lu%q4PoeN6PXrTXaj8erG{<3NE8jBc!09B&d|M~%sIUL{ zq#EM1q%f8Gd}k*HA`eP)j!pzr(9n;j^K!p<>s(8j~U$M(ge^2^09;@(mrD=j4M zmnFRAH7O<8#S>4C#d(-wA=LcRVzp~{FJs4!Ny?7b7hQ#@QG+Rwokd_CMI)1JI*Kqb z343HTHHp~-E-}z99a==HWt$bPjTiHF?u9td`zNO@sNhnJJL6nF*KS4F4BOU;6)wTq zL$4RfVFZJH(EC(!{rb3>EkgGsw0)_ca}zM{&Hl(I=hF825-;(UlI%Ev^RiMv`Ywyv zL*j5z++HQ2WrwDlJkuISpW+<^vz3ABiE1baE=)-TM1@C_AVE#q7;USi$VAxJH?!z7 zfd6*y+^|;0f#1U~%U{^O&7sBv8~DxLS>tTbzB1{&nKVjKPFX9XQ_N0PvRr5S7Zu7; znls5wt!={K@jtrw&qT$rS*7`?$Q7I@p@co(H`F{gWMr}&Gfjzje$*^k@tzHGbR$32 z(=|g$Aao?QVrd>4Z6Rgf$hnPRsJ|LGsrB~-C>k+=z;8N@Dl@Dk**9usH!zKmP!1(r z>60f=qW!;o)$QWZ%>Nb;H0Y<^hpC}6u39}f^&=K*IO&ADQc4RDOGlW%LiW>QEvjOK zlc@uq!s@eilf&#FNQPfz2n`p52}OUzV{CD|1CJHcM{hA+Ot5z#`@INA`T8eV<{*nH zzf#_bSPFmbpgMoaIo@=_9rLF*+B9KS50)0{Xfudc|J^btRUOjq3N6s!xk~?D$}is& z#)QDyUtH+~Awr`o`BWa%HwJBuakERBRC1~@DYhqU&}DFb5^r)ulovQo&_ae$HGpo~ z38adrmIy6?{?P^LiU3twmMbNA+69{yIn#|B;{8j`_^8yhfDNt&yKMehu;PJJ^^9Ic z_QFLfHj)#MhiI}KDUr z-dl6;gS`Bjp>x96p!6{p{zw#ZT8M_5p^a zXo`#wo2GSa?kb}FQVZlNu)@uKjex`o*Dz+RNa#r{V!EYq4Rt};051>$-7qN?fiH#- zonF?MxLHh^dRHQv5t~rfC9XITLsB~EW&j*{_}C|JWGTOFoGVfmJrh#;O@xLQz5+&K zLuIH)glOqawK+RZXcqy+XlQkz^x)FyCn9DTN9=NHL==Hrti#c1JxoY(GP9}G+N&QQ zf?9i)dSM1S(5(u|6hii*is`s_I|rj^o|e3L&Zs2y6-RpiEF{DY9PKa0PWzBr#U-uWa| zh582?9|0j6!ipTmr|W0m0|xFPDW1Y0erclQyL7>1)L`2{5cBD`@G^0iOP5MS3S_K2 zafV-wGX0L4tLOd~hWEF=$VCZlVv@}FuhH%LSdtP_=s2Rq#NRThTa$cgJ0HJqnuR6| z3|c~begBRt6!u+$Ev2-X2g!5e<9ChMdl$XIkaGALsSp&hCDF&U32Y zuDZ8>wj3m%!R{uW!6x)c0r`QJKmmXmpQSmc0FcvyQ-GTbXa?YhR$eo1ZZl}*G368B zg8AP=C<3DL<>$ftZX5~ZBaU)K7kM{~uv2$30_;aDoC4^87!)!L3{FBb5Ecs#ggpq& zurM$P($IZ zzXh}+LDvWTmo5J<)572c|98Razk!JV&v?nu3cVRlZ1WC$7Cd3)tGkVdqlKj_y92u| zz!BPn5&l-2oPt~i2UtxOMqz-ffHYg6Ai#H`!m6du(7?neMc z2t@=%3`GJ(3PlD*4n+Y)2}K1(4MhX>5sDUy4vHR%0g4fd35pr&6BG*+D-;_PI}`^L zClnVH0E!z52*m@%3&jV;4fD8xtBHZb$eB^GPT+4U zF{$#fA+@~Xg8Cld3bt(7_I(v{$v~8taJ38PHm3n5X{%A13#H5u+>(V zTlm{g{Zpm2Cf9sR&=ZZ4B@yVz&o_UHUpF}GI$jQ#i{|4|vLobaiZk1kXYok3I(CT< zs(+~<;@F~8!0t+VU9moB%vU@Cg1z<@ zeUky3Cz6%X{WccUefFQ9d7Ao{$2u$&59Hmoyd zD}(jmM#9X_bMAc&mq)DPMWi};5z=Y8RBtQTNDs)KYZC2nTYQg2JwGZhmE6u8FmI0K zAg|z#dQa%O*SO&kIT3ic?yn98)$h;q7(MyP&-MOlslL^Fv|E~6m-eEV@d>y_AM9mY z&IlBG31elpGcmd*KW}6U=V$n)c0$e_I2h!}7kFNKr~?G+j^4V=Svdr(m|T479YviK ztD})0X&C@E(zJ>W#PHKIcB+3XQfZafAIE_j)q=6*5GmE8F)*8GgO4 z3A>E-`Bmkq!6RFn?%rtae8#wPtT_Fr4@b((Ty~CvUt5p2|3x|IDzW1=&GP4s5ibDf z_vHB7%X)Ucon1bojd8$8^zY(PzqankfV`1Q;+0@ck=HsFCLk$f;fJ|f&i!M_iXQ_> z14q?OPxt=KqpIOE&$)@+&%0z%`4MR>TTZ8Uw2z!b6)sQ8|_w^HL6kkc+@f79a*P4QIDz?mtsozyHrn`YrNI# z{g6zdfedW1j3)nL;}JZ4X;uo4R=N0q# z@OZ3!Kegrw-q*PkRth*WnqxKv3%>9Nx*d;PT|^6s6oc=TAK}qgyFM1x1Uz*l9qumC zu5>_#;O~E}pWiG-1<#3X38}H)KKo`J-MmE3UH6`L3ppiA?}bDPZyj4LDv>4=pJ(*H z6px1A0yDCrN@Mw9FOOmyzlBqgS_zecC$;E}{RVY5J-3Hn^}-QG4Aa5{r2k_EgKCmU8QJr+W32@77^RP#=cP0JmvC_i+=Kb1fZZKJ@U=Vn5HTyKwyC-Jl5-w#K4+miJ>O_GeaVXRK?Wu-lY^J;b}s`hjfR2EokR0Km`7tXd$;Tsw7c%i0(!N{ zy+!>``GlM%qE-_cOn3LTM@m7G*0U_hPHgFI!^@&s3%(<9?oE$d<+;V8qUpkA6ujcQ zb3#5Q$)<7IJWJ`$=2Po&O`a?otzSLCxBNOhd+yaj?VsU=mDZeY;@?-xXX|d9euRZs z*UB9Sn0NT;NBbs3iq!MFmmduL{hHs_yKAKJ5$xe~{aDLlta3{AGE)zlDrH0;cU=+w zCmnFPg?wKgQuf-@_+{e_aX*F#$WnaaR=TRzduP)bqoN4*JDADAB2ah2_i$2otk7w0 zzFqQsCGF9A;4AjnS5j1P_wg{_dR%y1exmSXukE_8&VO3L78T_Exh58-AE@_qyvX;A zxqhHl;HWp1Iqv(?bQlI=IkS-cvwf!4eY%Co(ku8nT+s3+77?eOb{F?o&2`WBDRKWA z*AQL#PHWZ4-Q4c9J26688zC=pa_Wqb`^cs~%3f>zp<`0YAu!&-i;@TJtO4vb$1!Qh znI<^t?^=2azL^_dwW@oaKi&F;CIS8nZ47n) zPVN^U8{ddMd)RWz8G9eC{S*|Utw)-$LJx6bjdsgy=Su)m)ZPbxOYi+0vVnq8!s?{! zMemDEkI6;ol1`vFCEItCf4`fFxUcJYxs;N+a5iaW_L28x>9|E#Pj)A zke|9#E$?a4{<^t_WD524UAME1Ad_9Yvgas+v`7JUkFTKqW+Q(&$868L*~5jZ4sdv2 zuh$&LyB6d5I*qj8xnWng&(Qn_W*U8K=ll1SCWpXKz~cx~z!Al5oa44L|Et;1Cw7~i z;^E$~NyF<0oaV-r{T03Q&>^f3jOoC_2nDq~|Ao3C(-+>?N?A#xGF~IV;(YDQCG|+* zs?koqEEQUr|LMPrOM0UzwcDN1Q-Ve>w{m65ZhQT7OXW76E8A=J;l5ag=IlR) z$FoYV)Q9djT=!1wL-=9Rl)kRDes-s&$D-#w`%56#@@4Kid-ZO0WkoD-)njdPdu-Z{h){9j!NFq#SlaDWi0;UOivcNsd%Qd4kk`^@4crrQ;8_` z{rP&(!^@sBZ3uxM!<6gt?UljTY+~0LX|X?n0xuQ=g-J;=@5)&Gry`wp`=KA|`SPCL z5-$&!h1-`~;-UgeTa9`0w{D-)h5oUh&4AulAlJHlH{5qsXM{$zd`2LPnQ1nb03~4L z;j>;jRkFR{%ks53uIA_@VWTakT3JB1|8pdadRKT{w3Q}?F}KW_u>KdN=hOMJp9_eW z>y*shAMTxpjl0M-Z)ZixG^ek&D~5*-{P4!`x|BQv0vWu{<7id&=Ql57wmR{>^Fe~1 z8^40k57ntwA|C^fa+1+QtloAyWPd+xLLV#s-U7vn$F_)F_nyfCe4t~?cV_j0b4cff z%jn~?_!M-(jo&ePS$0&JMHbfn-Oi=QM5Z4;TnnZc zNBdc!QLKw?1`ZNp65U>6JkWVqXc zrihvzmWo&;w;8;W_;OnVla5c#m1tQ!IT9yjDZ8$d@z;}1^#_mxaYP@>&QEHV#@A2x z|K(qL@w_$mo~66l)bE zf$CI#a|YTVH##fHND277AW(D35XqAOsrnoeW~!~(NrfdF#uc{JrBCCefD+9EMP9|d%3bmVxMo6_I_+@J}7aJm&r z?5^_8EIC(j=B{CsNmw#PyOpzZ#yYG^^L%D8~ZW4Z;EAB zHt?G`i;O_PY`!(oi7ZPLR_ysUhxMi(w!nJ~AKp0Q!*>N*0LW-}Y8p6_oo|zus+_eh zLi`EQ_l#Bb6DLOv`ukMcsCcEUf?Z$1^2ati^5CJbN@!vATZaC)Yl@KZVR>1cb0)^A zqn#mA+18K{`LZ9AeI6OA_6mb>8d&5kds}`cCC+VYBGFY+ zvFMokc?M09ni12I8kO;xBuE|Da230^ceJPWlUAM9##x^{91o#aNJKHio$jjjYxra# zO44m#pEon10AKh7@X#3v-nxH7p=Zcah6A&7TZSQyUI3Kb7%}wa#f~!jE3C9+jSzd% zcxTC&PG@ph5)~73lFXKZugJt-csx+jD8|H=YXT#YW)#F)Ky6B&miQ;7F!?u$_`%Q9 zpGo+U_!4qT#OfH?)cfNdOl0sa%nt98e0~dy&^MO+2vsq+)sp)tVUNknwmFk1Fjkl3 z93BqV+s6U{Nj*|X_rbx!12A2m$-i$mS;EY@<}^ka zd6AfXZ~oL|iXjRZ(8ZTcyie@>+5a6FEyGO^R2a1ID+x!JB#DQ^Di8i9Y51kluDl8` zx)r%`07Lp`CBJ;m)z=X6`jz&c5bpEf47twtup!83!kIX7Uuc0_DZ`K1Mj3RKrJ)>W z+PVc$lG5lwA8UWtcbfCV&zAIH{OK0rSLlwGc9#;LJkOirXFg}JQnk7aKu`YM48BADw6Bjj9 zol8i7x%6XguJxk%kUCpAl=o09gKwCtNUc#IQ`xp~ql~mIJ5oD}D&AWHc*!k}|VMFAtp_cC21=Ro2~Gt^L{1NVIh z>YO-2iXF^`1g^w|#8=>_*#uO7S$?)j)5n&mb(>(S1w=Nlp04e_(}y)c!aq*)?FG%#5;$Ggi{-kP!C64gg7QkxGip zoLhg~^c8J2{LGM%B^RUcheSA0>a-Mmda)MWLFf;?;#7qf<|N2KJa8sVli|vVva(H7 zh|H^@BbN5T3rm@SM<4$C!ml@II-osNtgG&jF+8tZBC(@}o}~CAT1r1+9T)f!BnlMB zOUFkR|JRLa3P7+YhDU+z#`p%;Xv(m$&5!vOBY|W;OWQuYOD3zsFikB;Exw+C#b=Rq zp`cb5u7Sk~pJw|}cjt22TLkm)M}84nqLkus|2tYD35A%Y%CW+RN)Q_bCMo2Y{{)Nh zdua<$lHg+K?u6E1dixO<_K?&Cl=fxR2#q)*#2u|=G*;02OW#lk5d(4&^ey8z{nid3 zD)$V|ulpv{rEP07fMAb-Galo^A!j`wVfVoq%?I-Mh&a5<25$uHW1k|-C`SZh=OCG6 zL|jSA+*-K)k3JdFiJ#ACk^X+VU{r#!C=4e@`wk;0(P3Etu0^XJvNx^X19?c$!cY$$ z7T_?{nS`eYLzY~b`P;_6g%@c3i`4qnveA`zF~jR|KGXxTA?vXhC*}!8e-1$N?+GXl z#oX8AMX%@>)1v8ZU_fCUs_F)Tgj zW7*r66@MG$;{@>vFrHn0DJ;AACvRMX zPsrHn*6K8G9(m4wY=J_$4e<~x+M?-NYcwJxrFN)&CG7gl`LvuA=Iq_Q8DccZS;IpV z<%vZYEP>*E$HH{L^AOAmL-z=CpJart;mN95>>0c6~O zZ$a`+8`)3miaJZfZ@Ji)zOwumq@o{R1Lpb%!$0I}QaaA)|^hfu@ zy8r%7&DPDPwx`T~Q83$Nr(;T>CMKy* z5ZQ5Uk#ow^Wdp&W3j}Xo8A*lbG041QP~_6g#`we&#Wvvf&UcM|v9gc~e=T{psz2vb zt1%VFLfHN`v_T%lk4-pZ_1Qn8McEYTN>U4xFg3r)zmbO;$4dhAqGig`k1Cj zm$Q>3JcRT(7DY~XPLw!B{$?N{i1_FYD}pdjC7#abQiPgM@}J`hpNgN286H9F zNr{v6B(xyRC__wEfv7LNd}oKRR*&s>6Vg2jRce)#yS)lM$UCC~bX7~@IS7ogb$Il9 zD6F-(BwwP(kIs3MS0)-1BD$LVSwFWDHr7S%+R28fct{+w7fEX4 zp@0gze|YiNr12i2xO)UeE0vJ6;1N$sxMFv3#8`m(&PfG6QO4O+Z7Nw9M#$G(O|!iC z`+w(EO2r`~Kho8h`$6x7Q+Qfg2-gvtu*|-3eCnVpu6u(O;t;<{k-j?)cD=d9jPWA? zU*mi7fQ$~sZ)T4Irvs4SB68W7uyd)#Gl8UkEa6OsN6_5bQ|RaYvC<@}TuM+1Dp2MN zg(*Qwc$+8w_BM@O6ROvXTDZp!tp3GlGRrArv0b&rFDwqaQbRUknK=JQqQwv5B#7{N z*FI;JTqj(`QNoLjAbBuLF_0lX?_3(TIuoNS{)op^h`~UO!N8EdUrn61FG!Xl{#F)K zA*C%juuE5C7hg*IG%^e?x(DlSDIT{&p9}_7BL%Tqh9cyU5?=6r5;`rwz`y%zU0B5_ ztIVqLouo~-h$o)Vk&HeK3DiZVs~23hQHa*hxM77^Wpr4heJ{KrDk&X2lxs zO6|rFBJ828kRNttRr>XE??FBKpHiUV^0C< zMoF_!K(dDzveKZ9{xbljI=7%oF~N`0rVx2cu}{OqBB@?^42C9Dw0MtJ&cftHgbqFF zZ~Am{rOVWtwybPZ9Hd05ObfZt?%74_NpFRdUWsyY9Y1OWG7oflylKh9-9_}3I}cmR zTZ4ii_r*f?%;x)8L!17IY2Jh0{c51;e_M333PN^9#%qndMZa=zAIACEqB7Tmzdz$p z$?2eVd)^~6$;CMNqP%6~PBb@WB%qSoP{i56v~}UF;{*X|;2TgM9X-`AAp;a2dnLVM zMt0c}iyz6@^TrHT&uNsbxW^V0wF9qd$O($z;P?97e;W4kV~%!2NXd`_Or$_%X@fR+ zqe!b0DEMZ<6QoSVAILe>;Nde_@>HNS;Auh$}( z{l#wya3Lz&_)rr&+CUyoooN6jk|85R(W=aOoV)4O45)!g1WxXa40bX*+=iwmArH1cvoFbj@ zUz|i%8ruiEL42F~1=+eo8DzmByk=jQi0I;)c1(KA@MW#d8ViGHR13F2O*<7b*CQK4 z{H#U0^%LUTCmo=eD;BH^Pms z*po=37t?lrwbdYFEi8blY%m`J+=kcecJ{^vRoY;(Q($#*frCUlsEIUx$0cbZ2kzpS zBfo4q&ZLmK0){FLna8$vXGldJ?A2GUu#)GKNchK`Y(&qN!?9=L)W4Mia?za#4kD|Z zQP3{xZ%Tjtx$4a(T%9^{*#?QQjn902OL)JIVr%VxcUFT}OlSfLZw`kEh||<=<){A} zVQLdhP0i9=Aa6c(3Cp4?_;St`sxF01M6DD>6dR0WDien9`Q%V9YZdW87|Z(8epBxr zQ*=4UYVh5##1N;BFCM?{!+QT}HVXKmLRHO;m#$I%@KR1*TaK;j5I-iY4Wnq~3iAZa zgPF7h4%}%JyQ&1ioYEOKc-NvHqm$IlVyk}=7HM=&qG=!}AmP!54VLQU@%&PtJT@Fw4H`{F<;%moWOj?T-@DytSON3 zFI~*ZDjw45whH^}5Z(W|G78t9`^hnn?CS^0ZmjE6@=H$;fni}o(z_;FUPD{$JJGtc z+^I1usv|JHO)mv=+>DvnRH?D0V$(PQ4VCs?MH(hzAh%Y7sZjTt^5!IjP&Dh9NIW#@ z>kcxS4dqTV!zDd|nQZhKZw>ide73gCt3{;NX623gegOr|C`LZ#wYhPi1oZa+&H)9d zG(0~(9eV>Pvg)nj%iCQNZ#1?A#=Ph&0(){_%!R>I4{~~s6?*_8JF`fB=0_{VuW9gn zWzsc~Q{3LFh4Bp48;F_`&RTki5C1ka-Ae|R$xRt;=#eJTnEC7f1_=VNdC^^XP^_B{ z$cg(yKyFzHK{IJ;_&1r^Y(~VDb&8+Zy91jo^wNMJaf93i=tm5wuK=d|z<*8BUDRsE z2fYX{e{DIBtAg^AX3+7~?N>8|Pr+Y7%w}yI8guxKxCL08QmnCbHb}^(yDH8|U-hIb zuYEkku^SzzK=#CXPCjoA1Tqj^zfvF?kwcIqDtRB^EsK(WdXVNii=mrcy1x7yPS&Gs z4g?jX;iVbX$PgW&-u(~7?{hGgIg`Y6-Z_npQ*(g`q6GR!i_m97`w7^!s~KAEf>CM# zI=0|h8<~P_CIeOj*ABXGnm1i9R?{wxNGm83In7Ex{3{ey+37wm0J>_$RJuplyC=F- zP`Wk(QVyyU!#^g^+305X=HY70pUh31?@4)pg610E=2J3}Qb{H#_RtadnKUk8ZxPDF zk6KZ_72r~o(emV6d`?;{Wx_$0+$|{HrJ~PTFV%hTksp&Zxj9mlP7HOx#8{;EK^G-P zz(*YT3U}pC6;X+gxWg={Ku6XZC9xk-h=H`f{_x#kIzKA29`G1xJ0x&%!HQd%D~-Em zK|Y|mznqsy3hpT~WsdZP%;g6F3-%O+|Y-);&X<1J%K*mc}+ucsWF#iL4 C$n#?W diff --git a/mnogosearch.spec b/mnogosearch.spec index 65363eb..3e64967 100644 --- a/mnogosearch.spec +++ b/mnogosearch.spec @@ -26,7 +26,7 @@ Source3: httpd.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} -Requires: /usr/bin/catdoc +Requires: /usr/bin/wvHtml Requires: /usr/bin/xlhtml Requires: /usr/bin/ppthtml Requires: /usr/bin/pdftotext @@ -173,7 +173,7 @@ sed -i 's|#Server http://localhost/|Server http://localhost/|g' \ # enable common external document helpers by default # we require them so they will be installed -sed -i 's|#Mime application/msword "text/plain; charset=utf-8" "catdoc -a -dutf-8 $1"|Mime application/msword "text/plain; charset=utf-8" "catdoc -a -dutf-8 $1"|g' \ +sed -i 's|#Mime application/msword "text/html; charset=utf-8" "wvHtml --charset=utf-8 $1 -"|Mime application/msword "text/html; charset=utf-8" "wvHtml --charset=utf-8 $1 -"|g' \ %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf sed -i 's|#Mime application/pdf text/plain "pdftotext $1 -"|Mime application/pdf text/plain "pdftotext $1 -"|g' \ @@ -185,6 +185,15 @@ sed -i 's|#Mime application/vnd.ms-excel text/html "xlhtml $1"| sed -i 's|#Mime application/vnd.ms-powerpoint text/html "ppthtml $1"|Mime application/vnd.ms-powerpoint text/html "ppthtml $1"|g' \ %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf +sed -i 's|Disallow \*.tex \*.texi \*.xls \*.doc \*.texinfo|Disallow *.tex *.texi *.texinfo|g' \ + %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf + +sed -i 's|Disallow \*.rtf \*.pdf \*.cdf \*.ps|Disallow *.rtf *.cdf *.ps|g' \ + %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf + +sed -i 's|Disallow \*.ai \*.eps \*.ppt \*.hqx|Disallow *.ai *.eps *.hqx|g' \ + %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf + # the cgi is no regular binary, move it to libexec install -d %{buildroot}%{_libexecdir}/mnogosearch mv -f %{buildroot}%{_bindir}/*.cgi %{buildroot}%{_libexecdir}/mnogosearch/ @@ -332,6 +341,8 @@ service httpd condrestart > /dev/null 2>&1 || : - enable some external document helpers by default: we always have them because of requires - require the binaries of the helpers used, not the package names +- use wvHtml instead of catdoc by default: it retains formatting +- don't disable the file types we now have helpers for * Thu Jan 27 2011 Gerd v. Egidy 3.3.11-1 - mnogosearch 3.3.11 -- 1.7.1