From 1b097383ae7b16c3f05f8be9b3ae22b22e8226d9 Mon Sep 17 00:00:00 2001
From: Patrick Laughton <jima@fedoraproject.org>
Date: Oct 24 2006 16:26:49 +0000
Subject: - Fixed BZ#212005

- Moved %%postun scriptlet to %%post, where it made more sense
- Render scriptlets safer
- Minor cleanup for consistency

---

diff --git a/dnsmasq.spec b/dnsmasq.spec
index 9ed381c..0fc2db5 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.34
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -63,19 +63,18 @@ install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add dnsmasq
+if [ "$1" = "2" ]; then # if we're being upgraded
+    /sbin/service dnsmasq condrestart >/dev/null 2>&1 || :
+else # if we're being installed
+    /sbin/chkconfig --add dnsmasq
+fi
 
 %preun
-if [ $1 = 0 ]; then     # execute this only if we are NOT doing an upgrade
-    service dnsmasq stop >/dev/null 2>&1
+if [ "$1" = "0" ]; then     # execute this only if we are NOT doing an upgrade
+    /sbin/service dnsmasq stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del dnsmasq
 fi
 
-%postun
-if [ "$1" -ge "1" ]; then
-    service dnsmasq restart >/dev/null 2>&1
-fi
-
 
 %files
 %defattr(-,root,root,-)
@@ -90,6 +89,12 @@ fi
 
 
 %changelog
+* Tue Oct 24 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.34-2
+- Fixed BZ#212005
+- Moved %%postun scriptlet to %%post, where it made more sense
+- Render scriptlets safer
+- Minor cleanup for consistency
+
 * Thu Oct 19 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.34-1
 - Hardcoded version in patches, as I'm getting tired of updating them
 - Update to 2.34