- FHS 2.0 fixes (/var/db -> /var/state)

- allow minitoring multiple interfaces

Changed files:
    arpwatch.spec -> 1.16

diff --git a/arpwatch.spec b/arpwatch.spec
index f283365d8c19a184117c8d0671a5cda784b80a7d..741e1e5afe1fd2685ef2aa804e1b7a760309f5ce 100644 (file)
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -2,7 +2,7 @@ Summary:        Arpwatch monitors changes in ethernet/ip address pairings.
 Summary(pl):   Arpwatch monitoruje zmiany w parach adresów ethernet/ip
 Name:          arpwatch
 Version:       2.1a4
-Release:       7
+Release:       8
 Group:         Applications/Networking
 Group(pl):     Aplikacje/Sieciowe
 Copyright:     GPL
@@ -31,25 +31,26 @@ Dodatkowo tworzona jest baza par adres
 %build
 LDFLAGS="-s"; export LDFLAGS
 %configure
-make ARPDIR=/var/db/arpwatch
+make ARPDIR=/var/state/arpwatch
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{var/db/arpwatch,etc/rc.d/init.d,%{_sbindir},%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT/{var/state/arpwatch,etc/rc.d/init.d,%{_sbindir},%{_mandir}/man8}
 
 make install install-man DESTDIR=$RPM_BUILD_ROOT
 
-install {arp2ethers,massagevendor} $RPM_BUILD_ROOT/var/db/arpwatch
-install *.{awk,dat} $RPM_BUILD_ROOT/var/db/arpwatch
+install {arp2ethers,massagevendor} $RPM_BUILD_ROOT/var/state/arpwatch
+install *.{awk,dat} $RPM_BUILD_ROOT/var/state/arpwatch
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/arpwatch
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/arpwatch
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/* \
        README CHANGES
 
 %post
 /sbin/chkconfig --add arpwatch
-if test -r /var/run/arpwatch.pid; then
+if test -r /var/lock/subsys/arpwatch; then
        /etc/rc.d/init.d/arpwatch restart 1>&2
 else
        echo "Run \"/etc/rc.d/init.d/arpwatch start\" to start arpwatch daemon."
@@ -72,12 +73,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(754,root,root) /etc/rc.d/init.d/arpwatch
 %attr(755,root,root) %{_sbindir}/*
 
+%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/arpwatch
+
 %{_mandir}/man8/*
 
-%dir    /var/db/arpwatch
-%config(noreplace) %verify(not size mtime md5) /var/db/arpwatch/arp.dat
-%config %verify(not size mtime md5) /var/db/arpwatch/ethercodes.dat
-/var/db/arpwatch/*.awk
+%dir    /var/state/arpwatch
+%config(noreplace) %verify(not size mtime md5) /var/state/arpwatch/arp.dat
+%config %verify(not size mtime md5) /var/state/arpwatch/ethercodes.dat
+/var/state/arpwatch/*.awk
 
-%attr(755,root,root) /var/db/arpwatch/arp2ethers
-%attr(755,root,root) /var/db/arpwatch/massagevendor
+%attr(755,root,root) /var/state/arpwatch/arp2ethers
+%attr(755,root,root) /var/state/arpwatch/massagevendor