[arpwatch] remove redundant sysconfig-related stuff
jsynacek
jsynacek at fedoraproject.org
Mon Mar 3 13:59:59 UTC 2014
commit 9e04a5900febbd949ffb0fc6e130e1f343a361cf
Author: Jan Synacek <jsynacek at redhat.com>
Date: Mon Mar 3 14:52:18 2014 +0100
remove redundant sysconfig-related stuff
arpwatch.service | 3 +--
arpwatch.spec | 5 +----
arpwatch.sysconfig | 4 ----
3 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/arpwatch.service b/arpwatch.service
index 73c6286..bad9fa5 100644
--- a/arpwatch.service
+++ b/arpwatch.service
@@ -5,9 +5,8 @@ Documentation=man:arpwatch
[Service]
Type=forking
-EnvironmentFile=-/etc/sysconfig/arpwatch
PrivateTmp=yes
-ExecStart=/usr/sbin/arpwatch $OPTIONS
+ExecStart=/usr/sbin/arpwatch -u arpwatch -e root -s 'root (Arpwatch)'
[Install]
WantedBy=multi-user.target
diff --git a/arpwatch.spec b/arpwatch.spec
index afd4e5f..13b1bf2 100644
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -18,7 +18,6 @@ BuildRequires: /usr/sbin/sendmail libpcap-devel systemd-devel
Source0: ftp://ftp.ee.lbl.gov/arpwatch-%{version}.tar.gz
Source1: arpwatch.service
-Source2: arpwatch.sysconfig
# created by:
# wget -O- http://standards.ieee.org/regauth/oui/oui.txt | \
# iconv -f iso8859-1 -t utf8 | massagevendor | bzip2
@@ -84,7 +83,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mkdir -p $RPM_BUILD_ROOT%{_vararpwatch}
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
touch $RPM_BUILD_ROOT%{_vararpwatch}/arp.dat-
make DESTDIR=$RPM_BUILD_ROOT install install-man
@@ -106,7 +104,6 @@ done
install -p -m644 *.dat $RPM_BUILD_ROOT%{_vararpwatch}
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
@@ -144,7 +141,6 @@ fi
%{_sbindir}/massagevendor
%{_mandir}/man8/*.8*
%{_unitdir}/arpwatch.service
-%config(noreplace) %{_sysconfdir}/sysconfig/arpwatch
%attr(1775,-,arpwatch) %dir %{_vararpwatch}
%attr(0644,arpwatch,arpwatch) %verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/arp.dat
%attr(0644,arpwatch,arpwatch) %verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/arp.dat-
@@ -154,6 +150,7 @@ fi
%changelog
* Mon Feb 3 2014 Jan Synáček <jsynacek at redhat.com> 14:2.1a15-31
- reference documentation in the service file
+- remove redundant sysconfig-related stuff
* Sun Aug 4 2013 Peter Robinson <pbrobinson at fedoraproject.org> 14:2.1a15-30
- Fix FTBFS
More information about the scm-commits
mailing list