From 904296ded206ef8ed24d199523481ecd7d7d2960 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: May 02 2006 16:48:07 +0000 Subject: Don't install dbus/dnsmasq.conf on FC3 (dbus too old) --- diff --git a/dnsmasq.spec b/dnsmasq.spec index 76a83a1..9bc9d10 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 4.2%{?dist} +Release: 4.2%{?dist}.1 Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -53,7 +53,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ +%endif install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -79,13 +81,18 @@ fi %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf +%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2.fc3.1 +- Don't install dbus/dnsmasq.conf on FC3 (dbus too old) + * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) - Killed sysconfig file (provides unneeded functionality)