align variables with clamav and sav

uvscan/rc.uvscan

@@ -5,15 +5,14 @@
 
 %config
     uvscan_enable="$openpkg_rc_def"
-    uvscan_dat_url="ftp://ftp.nai.com/pub/antivirus/datfiles/4.x/"
-    uvscan_dat_update="daily"
+    uvscan_dat="ftp://ftp.nai.com/pub/antivirus/datfiles/4.x/"
+    uvscan_update="daily"
 
 %common
-    rcService uvscan enable yes || exit 0
     uvscan_update () {
         #   determine information
         uvscan_datadir="@l_prefix@/var/uvscan/data"
-        uvscan_datfile=`@l_prefix@/bin/curl -s "$uvscan_dat_url" 2>/dev/null |\
+        uvscan_datfile=`@l_prefix@/bin/curl -s "$uvscan_dat" 2>/dev/null |\
                         grep 'dat-[0-9][0-9]*\.tar' | sort | tail -1 |\
                         sed -e 's;^.*\(dat-[0-9][0-9]*\.tar\).*$;\1;'`
         uvscan_tmpdir=`echo "${uvscan_datfile}" | sed -e 's;\.tar$;;'`
@@ -23,7 +22,7 @@
         cd ${uvscan_datadir} || exit 1
         rm -f ${uvscan_datfile} >/dev/null 2>&1 || true
         @l_prefix@/bin/curl -s -o ${uvscan_datfile} \
-            ${uvscan_dat_url}/${uvscan_datfile} || exit 1
+            ${uvscan_dat}/${uvscan_datfile} || exit 1
         rm -rf ${uvscan_tmpdir} >/dev/null 2>&1 || true
         mkdir ${uvscan_tmpdir}
         ( cd ${uvscan_tmpdir} && @l_prefix@/bin/tar -xf ../${uvscan_datfile} ) || exit 1
@@ -41,19 +40,19 @@
 
 %hourly -u @l_musr@
     rcService uvscan enable yes || exit 0
-    if [ ".$uvscan_dat_update" = .hourly ]; then
+    if [ ".$uvscan_update" = .hourly ]; then
         uvscan_update || exit $?
     fi
 
 %daily -u @l_musr@
     rcService uvscan enable yes || exit 0
-    if [ ".$uvscan_dat_update" = .daily ]; then
+    if [ ".$uvscan_update" = .daily ]; then
         uvscan_update || exit $?
     fi
 
 %weekly -u @l_musr@
     rcService uvscan enable yes || exit 0
-    if [ ".$uvscan_dat_update" = .weekly ]; then
+    if [ ".$uvscan_update" = .weekly ]; then
         uvscan_update || exit $?
     fi
 

uvscan/uvscan.spec

@@ -39,7 +39,7 @@ Class:        EVAL
 Group:        Filesystem
 License:      Commercial/Free-Trial
 Version:      %{V_engine}.%{V_datfiles}
-Release:      20040519
+Release:      20040523
 
 #   list of sources
 Source0:      ftp://ftp.mcafee.com/pub/antivirus/datfiles/4.x/dat-%{V_datfiles}.tar