add bzip2 and libiconv as dependencies and fix substitution in clamd.conf (syntax has changed in 0.90)

clamav/clamav.spec

@@ -48,8 +48,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, bzip2
 PreReq:       OpenPKG, openpkg >= 20060823
-BuildPreReq:  zlib, curl, gmp
-PreReq:       zlib, curl, gmp
+BuildPreReq:  zlib, bzip2, curl, gmp, libiconv
+PreReq:       zlib, bzip2, curl, gmp, libiconv
 %if "%{with_milter}" == "yes"
 BuildPreReq:  milter
 PreReq:       milter
@@ -121,10 +121,10 @@ AutoReqProv:  no
     %{l_shtool} install -c -m 644 \
         -e 's;^\(Example\);#\1;' \
         -e 's;^#\(LogFile\) /.*;\1 %{l_prefix}/var/clamav/clamd.log;' \
-        -e 's;^#\(LogTime\).*;\1;' \
+        -e 's;^#\(LogTime.*\);\1;' \
         -e 's;^#\(PidFile\).*;\1 %{l_prefix}/var/clamav/clamd.pid;' \
         -e 's;^\(LocalSocket\).*;\1 %{l_prefix}/var/clamav/clamd.sock;' \
-        -e 's;^#\(FixStaleSocket\).*;\1;' \
+        -e 's;^#\(FixStaleSocket.*\);\1;' \
         -e 's;^#\(DatabaseDirectory\).*;\1 %{l_prefix}/share/clamav;' \
         -e 's;^#\(User\).*;\1 %{l_rusr};' \
         etc/clamd.conf \