diff --git a/dnsmasq.changes b/dnsmasq.changes index 08a0f66..2288d4b 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 10 16:24:17 CET 2009 - ug@suse.de + +- Enable dbus support by jnelson + ------------------------------------------------------------------- Fri Feb 6 10:09:35 CET 2009 - ug@suse.de diff --git a/dnsmasq.spec b/dnsmasq.spec index fdfd117..03e9098 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -21,7 +21,7 @@ Name: dnsmasq Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server Version: 2.47 -Release: 1 +Release: 2 License: GPL v2 or later Group: Productivity/Networking/DNS/Servers Provides: dns_daemon @@ -30,10 +30,11 @@ AutoReqProv: on Url: http://www.thekelleys.org.uk/dnsmasq/ Source: %{name}-%{version}.tar.bz2 Source1: vendor-files.tar.bz2 -Patch1: group_and_isc.diff +Patch1: group_and_isc.diff Patch2: chuser.diff Patch3: manpage.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: dbus-1-devel pkg-config %description Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP @@ -57,11 +58,12 @@ Authors: %patch1 -p0 %patch2 -p0 %patch3 -p0 +echo "#define HAVE_DBUS" >> src/config.h %build mv po/no.po po/nb.po export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%{__make} %{?jobs:-j%jobs} +%{__make} %{?jobs:-j%jobs} AWK=gawk %pre if ! /usr/bin/getent passwd dnsmasq >/dev/null; then @@ -82,7 +84,7 @@ fi rm -rf %{buildroot} %install -make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr +make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services @@ -92,6 +94,8 @@ install -m 644 dnsmasq.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/dnsmasq.conf install -m 644 dnsmasq.reg $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/ install -m 644 SuSEFirewall.dnsmasq-dns ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns install -m 644 SuSEFirewall.dnsmasq-dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp +install -d 755 ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/ +install -m 644 dbus/dnsmasq.conf ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf %find_lang %{name} %files -f %{name}.lang @@ -108,8 +112,11 @@ install -m 644 SuSEFirewall.dnsmasq-dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/syscon %{_mandir}/man8/dnsmasq.8.gz %{_mandir}/fr/man8/dnsmasq.8.gz %{_mandir}/es/man8/dnsmasq.8.gz +/etc/dbus-1/system.d/dnsmasq.conf %changelog +* Tue Mar 10 2009 ug@suse.de +- Enable dbus support by jnelson * Fri Feb 06 2009 ug@suse.de - Handle duplicate address detection on IPv6 more intelligently