- added using %%{__make} macro.

[packages/arpwatch.git] / arpwatch.spec

diff --git a/arpwatch.spec b/arpwatch.spec
index 4e740e53b33e04fcb1954e64606d27e97c49ffce..951cd1215dfd9ebac6c709324e5b9832bbc45516 100644 (file)
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -2,23 +2,23 @@ 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:       8
+Release:       11
 Group:         Applications/Networking
 Group(pl):     Aplikacje/Sieciowe
-Copyright:     GPL
+License:       GPL
 Source0:       ftp://ftp.ee.lbl.gov/%{name}-%{version}.tar.Z
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Patch0:                %{name}-makefile.patch
 Patch1:                arpwatch-arp2ethers.patch
 Prereq:                /sbin/chkconfig
-Requires:      rc-scripts
+Requires:      rc-scripts >= 0.2.0
 BuildRequires: libpcap-devel
-BuildRoot:     /tmp/%{name}-%{version}-root
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Arpwatch and arpsnmp are tools that monitors ethernet or fddi activity and
-maintain a database of ethernet/ip address pairings.
+Arpwatch and arpsnmp are tools that monitors ethernet or fddi activity
+and maintain a database of ethernet/ip address pairings.
 
 %description -l pl
 Arpwatch i arpsnmp to narzêdzia do monitorowania ethernetu i fddi.
@@ -32,17 +32,17 @@ Dodatkowo tworzona jest baza par adres
 %build
 LDFLAGS="-s"; export LDFLAGS
 %configure
-make ARPDIR=/var/state/arpwatch
+%{__make} ARPDIR=/var/lib/arpwatch
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{var/state/arpwatch,etc/{rc.d/init.d,sysconfig}} \
-       $RPM_BUILD_ROOT%{_sbindir},%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT/{var/lib/arpwatch,etc/{rc.d/init.d,sysconfig}} \
+       $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8}
 
-make install install-man DESTDIR=$RPM_BUILD_ROOT
+%{__make} install install-man DESTDIR=$RPM_BUILD_ROOT
 
-install {arp2ethers,massagevendor} $RPM_BUILD_ROOT/var/state/arpwatch
-install *.{awk,dat} $RPM_BUILD_ROOT/var/state/arpwatch
+install {arp2ethers,massagevendor} $RPM_BUILD_ROOT/var/lib/arpwatch
+install *.{awk,dat} $RPM_BUILD_ROOT/var/lib/arpwatch
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/arpwatch
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/arpwatch
@@ -52,7 +52,7 @@ gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/* \
 
 %post
 /sbin/chkconfig --add arpwatch
-if test -r /var/lock/subsys/arpwatch; then
+if [ -f /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."
@@ -61,8 +61,10 @@ fi
 %preun
 /sbin/chkconfig --del arpwatch
 if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/arpwatch ]; then
+               /etc/rc.d/init.d/arpwatch stop 1>&2
+       fi
        /sbin/chkconfig --del arpwatch
-       /etc/rc.d/init.d/arpwatch stop 1>&2
 fi
 
 %clean
@@ -79,10 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_mandir}/man8/*
 
-%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
+%dir    /var/lib/arpwatch
+%config(noreplace) %verify(not size mtime md5) /var/lib/arpwatch/arp.dat
+%config %verify(not size mtime md5) /var/lib/arpwatch/ethercodes.dat
+/var/lib/arpwatch/*.awk
 
-%attr(755,root,root) /var/state/arpwatch/arp2ethers
-%attr(755,root,root) /var/state/arpwatch/massagevendor
+%attr(755,root,root) /var/lib/arpwatch/arp2ethers
+%attr(755,root,root) /var/lib/arpwatch/massagevendor