new URL; fix clamav.conf substs; install freshclam.conf, too

clamav/clamav.spec

@@ -26,7 +26,7 @@
 #   package information
 Name:         clamav
 Summary:      Clam Antivirus
-URL:          http://clamav.sourceforge.net/
+URL:          http://www.clamav.net/
 Vendor:       Tomasz Kojm
 Packager:     The OpenPKG Project
 Distribution: OpenPKG
@@ -34,7 +34,7 @@ Class:        PLUS
 Group:        Filesystem
 License:      GPL
 Version:      0.71
-Release:      20040519
+Release:      20040523
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/clamav/clamav-%{version}.tar.gz
@@ -103,13 +103,21 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/etc/clamav
     %{l_shtool} install -c -m 644 \
         -e 's;^\(Example\);#\1;' \
-        -e 's;^#\(LogFile\).*;\1 %{l_prefix}/var/clamav/clamd.log;' \
+        -e 's;^#\(LogFile\) /.*;\1 %{l_prefix}/var/clamav/clamd.log;' \
+        -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;^#\(DataDirectory\).*;\1 %{l_prefix}/share/clamav;' \
+        -e 's;^#\(FixStaleSocket\).*;\1;' \
+        -e 's;^#\(DatabaseDirectory\).*;\1 %{l_prefix}/share/clamav;' \
         -e 's;^#\(User\).*;\1 %{l_rusr};' \
         etc/clamav.conf \
         $RPM_BUILD_ROOT%{l_prefix}/etc/clamav/
+    %{l_shtool} install -c -m 644 \
+        -e 's;^#\(DatabaseDirectory\).*;\1 %{l_prefix}/share/clamav;' \
+        -e 's;^#\(UpdateLogFile\).*;\1 %{l_prefix}/var/clamav/freshclam.log;' \
+        -e 's;^#\(NotifyClamd\).*;\1 %{l_prefix}/etc/clamav/clamav.conf;' \
+        etc/freshclam.conf \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/clamav/
 
     #   install run-command script
     %{l_shtool} mkdir -f -p -m 755 \
@@ -129,7 +137,7 @@ AutoReqProv:  no
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%config %{l_prefix}/etc/clamav/clamav.conf' \
+        '%config %{l_prefix}/etc/clamav/*.conf' \
         '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/clamav' \
         '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/share/clamav'