[arpwatch] make spec slightly more fedora-review-friendly

[jsynacek]

commit 60c046781e6cdaca397633670c828ba94be556cd
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Thu Jul 19 13:47:10 2012 +0200

    make spec slightly more fedora-review-friendly

 arpwatch.spec |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/arpwatch.spec b/arpwatch.spec
index 140869a..a2fd630 100644
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -1,4 +1,4 @@
-%define _vararpwatch %{_localstatedir}/lib/arpwatch
+%global _vararpwatch %{_localstatedir}/lib/arpwatch
 
 Name: arpwatch
 Epoch: 14
@@ -14,7 +14,6 @@ Requires(preun): systemd-units
 Requires(postun): systemd-units
 Requires: /usr/sbin/sendmail
 BuildRequires: /usr/sbin/sendmail libpcap-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.ee.lbl.gov/arpwatch-%{version}.tar.gz
 Source1: arpwatch.service
@@ -67,12 +66,11 @@ network.
 make ARPDIR=%{_vararpwatch}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_vararpwatch}
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 
 make DESTDIR=$RPM_BUILD_ROOT install install-man
@@ -94,16 +92,13 @@ for i in arp2ethers massagevendor massagevendor-old; do
 done
 
 install -p -m644 *.dat $RPM_BUILD_ROOT%{_vararpwatch}
-install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT/lib/systemd/system/arpwatch.service
+install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/arpwatch.service
 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/arpwatch
 install -p -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_vararpwatch}/ethercodes.dat.bz2
 bzip2 -df $RPM_BUILD_ROOT%{_vararpwatch}/ethercodes.dat.bz2
 
 rm -f $RPM_BUILD_ROOT%{_sbindir}/massagevendor-old
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 /bin/systemctl daemon-reload &> /dev/null
 :
@@ -138,21 +133,22 @@ fi
 :
 
 %files
-%defattr(-,root,root)
 %doc README CHANGES arpfetch
 %{_sbindir}/arpwatch
 %{_sbindir}/arpsnmp
 %{_sbindir}/arp2ethers
 %{_sbindir}/massagevendor
 %{_mandir}/man8/*.8*
-/lib/systemd/system/arpwatch.service
+%{_unitdir}/arpwatch.service
 %config(noreplace) %{_sysconfdir}/sysconfig/arpwatch
-%defattr(-,arpwatch,arpwatch)
 %dir %{_vararpwatch}
-%verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/arp.dat
-%verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/ethercodes.dat
+%attr(-,arpwatch,arpwatch) %verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/arp.dat
+%attr(-,arpwatch,arpwatch) %verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/ethercodes.dat
 
 %changelog
+* Thu Jul 19 2012 Jan Synáček <jsynacek at redhat.com> - 14:2.1a15-21
+- make spec slightly more fedora-review-friendly
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14:2.1a15-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild