X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=arpwatch.spec;h=951cd1215dfd9ebac6c709324e5b9832bbc45516;hb=ee3657e8687114bd5181d6ae59b10eb6f79fd807;hp=47e7222629127edcddba086f7fad091794f9eece;hpb=163bf1ee25834b6abb0a644d61db3e989e35f28c;p=packages%2Farpwatch.git

diff --git a/arpwatch.spec b/arpwatch.spec
index 47e7222..951cd12 100644
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -2,20 +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:	6
+Release:	11
 Group:		Applications/Networking
 Group(pl):	Aplikacje/Sieciowe
-Copyright:	GPL
-Source0:	ftp://ftp.ee.lbl.gov/%{name}-%{version}.tar.Z	
+License:	GPL
+Source0:	ftp://ftp.ee.lbl.gov/%{name}-%{version}.tar.Z
 Source1:	%{name}.init
+Source2:	%{name}.sysconfig
 Patch0:		%{name}-makefile.patch
-#BuildPrereq:	libpcap-devel
-Prereq:		chkconfig
-BuildRoot:	/tmp/%{name}-%{version}-root
+Patch1:		arpwatch-arp2ethers.patch
+Prereq:		/sbin/chkconfig
+Requires:	rc-scripts >= 0.2.0
+BuildRequires:	libpcap-devel
+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.
@@ -24,56 +27,64 @@ Dodatkowo tworzona jest baza par adres
 %prep
 %setup  -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
+LDFLAGS="-s"; export LDFLAGS
 %configure
-make ARPDIR=/var/db/arpwatch
+%{__make} ARPDIR=/var/lib/arpwatch
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/{var/lib/arpwatch,etc/{rc.d/init.d,sysconfig}} \
+	$RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8}
 
-install -d $RPM_BUILD_ROOT/{var/db/arpwatch,etc/rc.d/init.d,usr/{sbin,share/man/man8}}
+%{__make} install install-man DESTDIR=$RPM_BUILD_ROOT
 
-make install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	install-man
-
-for n in arp2ethers massagevendor; do
-        install -m755 $n $RPM_BUILD_ROOT/var/db/arpwatch
-done
-for n in *.awk *.dat; do
-        install -m644 $n $RPM_BUILD_ROOT/var/db/arpwatch
-done
+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
-
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/*
-gzip -9nf README CHANGES
-
-%post 
-chkconfig --add arpwatch
-
-%preun 
-chkconfig --del arpwatch
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/arpwatch
+
+gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/* \
+	README CHANGES
+
+%post
+/sbin/chkconfig --add arpwatch
+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."
+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
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc    README.gz CHANGES.gz
+%doc README.gz CHANGES.gz
 
+%attr(754,root,root) /etc/rc.d/init.d/arpwatch
 %attr(755,root,root) %{_sbindir}/*
 
-%{_mandir}/man8/*
+%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/arpwatch
 
-%attr(754,root,root) /etc/rc.d/init.d/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/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/db/arpwatch/arp2ethers
-%attr(755,root,root) /var/db/arpwatch/massagevendor
+%attr(755,root,root) /var/lib/arpwatch/arp2ethers
+%attr(755,root,root) /var/lib/arpwatch/massagevendor