[dhcp-forwarder] further cleanups
Peter Robinson
pbrobinson at fedoraproject.org
Sat Oct 20 12:17:36 UTC 2012
commit 62ad7a8494b590732a97b6288a429c5e14af1bba
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Sat Oct 20 13:17:26 2012 +0100
further cleanups
dhcp-forwarder.spec | 9 +--------
dhcp-forwarder.upstart | 8 --------
2 files changed, 1 insertions(+), 16 deletions(-)
---
diff --git a/dhcp-forwarder.spec b/dhcp-forwarder.spec
index fefc01a..3670701 100644
--- a/dhcp-forwarder.spec
+++ b/dhcp-forwarder.spec
@@ -33,7 +33,7 @@ Group: System Environment/Daemons
URL: http://www.nongnu.org/dhcp-fwd/
Source0: http://savannah.nongnu.org/download/dhcp-fwd/%name-%version.tar.xz
Source1: http://savannah.nongnu.org/download/dhcp-fwd/%name-%version.tar.xz.asc
-BuildRoot: %_tmppath/%name-%version-%release-root
+
Requires: init(%name)
BuildRequires: which
BuildRequires: fedora-usermgmt-devel
@@ -127,11 +127,8 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-
make DESTDIR=$RPM_BUILD_ROOT install install-contrib
install -d -m 0700 $RPM_BUILD_ROOT%homedir $RPM_BUILD_ROOT%_var/run
-install -D -p -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/init/dhcp-forwarder.conf
touch $RPM_BUILD_ROOT%_var/run/dhcp-fwd.pid
@@ -146,10 +143,6 @@ touch $RPM_BUILD_ROOT%_var/run/dhcp-fwd.pid
make check
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%pre
%__fe_groupadd 11 -r %username &>/dev/null || :
%__fe_useradd 11 -r -s /sbin/nologin -M -c 'DHCP Forwarder user' \
More information about the scm-commits
mailing list