rpms/dnsmasq/FC-3 dnsmasq.spec,1.7,1.8

Patrick Laughton (jima) fedora-extras-commits at redhat.com
Tue May 2 16:48:07 UTC 2006


Author: jima

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

Modified Files:
	dnsmasq.spec 
Log Message:

Don't install dbus/dnsmasq.conf on FC3 (dbus too old)



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dnsmasq.spec	2 May 2006 16:37:48 -0000	1.7
+++ dnsmasq.spec	2 May 2006 16:48:07 -0000	1.8
@@ -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 @@
 	$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 @@
 %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 <jima at auroralinux.org> 2.30-4.2.fc3.1
+- Don't install dbus/dnsmasq.conf on FC3 (dbus too old)
+
 * Tue May  2 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-4.2
 - More upstream-recommended cleanups :)
 - Killed sysconfig file (provides unneeded functionality)




More information about the fedora-extras-commits mailing list