[dhcp-forwarder/f18: 6/6] fix merge

[Peter Robinson]

commit 726141b406ab55082d0bc728a69fe922e0f2fe66
Merge: 6ee80da 62ad7a8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Oct 20 13:28:14 2012 +0100

    fix merge

 dhcp-forwarder.spec    |   54 ++++++-----------------------------------------
 dhcp-forwarder.upstart |    8 -------
 2 files changed, 7 insertions(+), 55 deletions(-)
---
diff --cc dhcp-forwarder.spec
index ddf388e,3670701..4982bf8
--- a/dhcp-forwarder.spec
+++ b/dhcp-forwarder.spec
@@@ -28,7 -27,7 +27,6 @@@
  Summary:	DHCP relay agent
  Name:		dhcp-forwarder
  Version:	0.10
- Release:	%release_func 1803
 -Release:	%release_func 1900.1
  License:	GPLv3
  Group:		System Environment/Daemons
  URL:		http://www.nongnu.org/dhcp-fwd/
@@@ -257,20 -215,14 +216,21 @@@ test "$1" -eq 1 || /bin/systemctl try-r
    %ghost %_var/run/dhcp-fwd.pid
  %endif
  
- %if 0%{?with_upstart:1}
- %files upstart
-   %defattr(-,root,root,-)
-   %config(noreplace) /etc/init/*
- %endif
+ %changelog
+ * Sat Oct 20 2012 Peter Robinson <pbrobinson at fedoraproject.org>	0.10-1900.1
+ - drop upstart as it's no longer in Fedora
  
+ * Sun Aug 19 2012 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.10-1900
+ - disabled upstart
+ - removed old sysv cruft
  
 +%changelog
 +* Wed Aug 22 2012 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.10-1803
 +- fixed upgrade path by obsoleting -upstart
 +
 +* Sun Aug 19 2012 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.10-1802
 +- disabled upstart
 +
  * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-1801
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild