rpms/dnsmasq/devel .cvsignore, 1.27, 1.28 dnsmasq.init, 1.2, 1.3 dnsmasq.spec, 1.45, 1.46 import.log, 1.1, 1.2 sources, 1.27, 1.28

[Itamar Reis Peixoto]

Author: itamarjp

Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12150/devel

Modified Files:
	.cvsignore dnsmasq.init dnsmasq.spec import.log sources 
Log Message:
- new version 2.5.2 and some bug fix



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	18 Oct 2009 00:28:38 -0000	1.27
+++ .cvsignore	26 Jan 2010 16:24:32 -0000	1.28
@@ -1 +1 @@
-dnsmasq-2.51.tar.lzma
+dnsmasq-2.52.tar.lzma


Index: dnsmasq.init
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dnsmasq.init	22 Nov 2009 11:47:49 -0000	1.2
+++ dnsmasq.init	26 Jan 2010 16:24:33 -0000	1.3
@@ -62,7 +62,7 @@ case "$1" in
 	RETVAL=$?
 	;;
   condrestart)
-	    if test "x`/sbin/pidof dnsmasq`" != x; then
+	    if test "x`pidfileofproc dnsmasq`" != x; then
 		$0 stop
 		$0 start
 		RETVAL=$?


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- dnsmasq.spec	22 Nov 2009 11:47:49 -0000	1.45
+++ dnsmasq.spec	26 Jan 2010 16:24:33 -0000	1.46
@@ -10,8 +10,8 @@
 %endif
 
 Name:           dnsmasq
-Version:        2.51
-Release:        2%{?extraversion}%{?dist}
+Version:        2.52
+Release:        1%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -50,7 +50,7 @@ for file in dnsmasq.conf.example man/dns
 done
 
 #enable dbus
-sed -i 's|/* #define HAVE_DBUS */|#define HAVE_DBUS|g' src/config.h
+sed -i 's|/\* #define HAVE_DBUS \*/|#define HAVE_DBUS|g' src/config.h
 
 #enable /etc/dnsmasq.d fix bz 526703
 sed -i 's|#conf-dir=/etc/dnsmasq.d|conf-dir=/etc/dnsmasq.d|g' dnsmasq.conf.example
@@ -118,6 +118,11 @@ fi
 
 
 %changelog
+* Tue Jan 26 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.52-1
+- New Version 2.52
+- fix condrestart() in initscript bz 547605
+- fix sed to enable DBUS(the '*' need some escaping) bz 553161
+
 * Sun Nov 22 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.51-2
 - fix bz 512664
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	18 Oct 2009 00:28:38 -0000	1.1
+++ import.log	26 Jan 2010 16:24:33 -0000	1.2
@@ -1 +1,2 @@
 dnsmasq-2_51-1_fc12:HEAD:dnsmasq-2.51-1.fc12.src.rpm:1255825544
+dnsmasq-2_52-1_fc13:HEAD:dnsmasq-2.52-1.fc13.src.rpm:1264522855


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	18 Oct 2009 00:28:38 -0000	1.27
+++ sources	26 Jan 2010 16:24:33 -0000	1.28
@@ -1 +1 @@
-0f048f3fd1f3888876867809d162cd89  dnsmasq-2.51.tar.lzma
+2d156f322564fdd71ad238040cd607ac  dnsmasq-2.52.tar.lzma