package cleanup

amd/amd.spec

@@ -34,7 +34,7 @@ Class:        BASE
 Group:        System
 License:      BSD
 Version:      6.0.9
-Release:      20040603
+Release:      20040902
 
 #   list of sources
 Source0:      ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
@@ -77,7 +77,12 @@ AutoReqProv:  no
 %prep
     %setup -q -n am-utils-%{version}
     %patch -p0
-    %{l_shtool} subst -e 's;ext2;ext3 ext2;' configure
+    %{l_shtool} subst \
+        -e 's;ext2;ext3 ext2;' \
+        configure
+    %{l_shtool} subst \
+        -e 's;/etc/amd.conf;%{l_prefix}/etc/amd/amd.conf;g' \
+        amd/get_args.c
 
 %build
     #   disable system LDAP support because it makes trouble (at least under Solaris 9)

amd/rc.amd

@@ -29,7 +29,7 @@
 %start -u @l_susr@
     rcService amd enable yes || exit 0
     rcService amd active yes && exit 0
-    @l_prefix@/sbin/amd -F @l_prefix@/etc/amd/amd.conf >/dev/null 2>&1
+    @l_prefix@/sbin/amd >/dev/null 2>&1
 
 %stop -u @l_susr@
     rcService amd enable yes || exit 0
@@ -50,8 +50,6 @@
 
 %daily -u @l_susr@
     rcService amd enable yes || exit 0
-
-    #   rotate logfile
     shtool rotate -f \
         -n ${amd_log_numfiles} -s ${amd_log_minsize} -d \
         -z ${amd_log_complevel} -o @l_musr@ -g @l_mgrp@ -m 644 \