rpms/dnsmasq/FC-6 dnsmasq.spec,1.12,1.13

[Patrick Laughton (jima)]

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3003

Modified Files:
	dnsmasq.spec 
Log Message:

* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at 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                                                 



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-6/dnsmasq.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dnsmasq.spec	19 Oct 2006 18:09:19 -0000	1.12
+++ dnsmasq.spec	24 Oct 2006 16:37:10 -0000	1.13
@@ -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 @@
 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 @@
 
 
 %changelog
+* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at 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 at beer.tclug.org> 2.34-1
 - Hardcoded version in patches, as I'm getting tired of updating them
 - Update to 2.34