diff --git a/.cvsignore b/.cvsignore index a90d914..108ce3b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dnsmasq-2.51.tar.lzma +dnsmasq-2.52.tar.lzma diff --git a/dnsmasq.init b/dnsmasq.init index d106a0c..81364f7 100644 --- a/dnsmasq.init +++ b/dnsmasq.init @@ -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=$? diff --git a/dnsmasq.spec b/dnsmasq.spec index 8654cf1..5c969eb 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -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/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do 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 - 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 - 2.51-2 - fix bz 512664 diff --git a/import.log b/import.log index ab5c802..5783482 100644 --- a/import.log +++ b/import.log @@ -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 diff --git a/sources b/sources index 4abdca9..ad582af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f048f3fd1f3888876867809d162cd89 dnsmasq-2.51.tar.lzma +2d156f322564fdd71ad238040cd607ac dnsmasq-2.52.tar.lzma