[dhcp-forwarder] Revert "further cleanups"

[ensc]

commit cf411a71dd64d46eeca2cf1a01c39958c2cd0934
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Sun Oct 21 04:23:15 2012 +0200

    Revert "further cleanups"
    
    This reverts commit 62ad7a8494b590732a97b6288a429c5e14af1bba.

 dhcp-forwarder.spec    |    9 ++++++++-
 dhcp-forwarder.upstart |    8 ++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/dhcp-forwarder.spec b/dhcp-forwarder.spec
index 3670701..fefc01a 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,8 +127,11 @@ 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
 
@@ -143,6 +146,10 @@ 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' \
diff --git a/dhcp-forwarder.upstart b/dhcp-forwarder.upstart
new file mode 100644
index 0000000..4dbf5fb
--- /dev/null
+++ b/dhcp-forwarder.upstart
@@ -0,0 +1,8 @@
+### Uncomment *one* of the 'start' lines below
+#start on runlevel [345] and starting local
+
+stop  on runlevel [!345]
+
+respawn
+expect stop
+exec /usr/sbin/dhcp-fwd -N -c /etc/dhcp-fwd.conf