rpms/dnsmasq/FC-3 dnsmasq.spec,1.9,1.10

[Patrick Laughton (jima)]

Author: jima

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

Modified Files:
	dnsmasq.spec 
Log Message:

Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dnsmasq.spec	8 May 2006 17:05:40 -0000	1.9
+++ dnsmasq.spec	15 May 2006 16:14:15 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.31
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -11,7 +11,7 @@
 Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{dist}" != ".fc3"
+%if "%fedora" > "3" || "%aurora" > "2"
 BuildRequires:  dbus-devel
 %endif
 
@@ -34,7 +34,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%if "%{dist}" != ".fc3"
+%if "%fedora" > "3" || "%aurora" > "2"
 %patch1 -p1
 %endif
 
@@ -51,7 +51,7 @@
 	$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"
+%if "%fedora" > "3" || "%aurora" > "2"
 install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
 %endif
 install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
@@ -79,7 +79,7 @@
 %defattr(-,root,root,-)
 %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
-%if "%{dist}" != ".fc3"
+%if "%fedora" > "3" || "%aurora" > "2"
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
 %endif
 %{_initrddir}/dnsmasq
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Mon May 15 2006 Patrick "Jima" Laughton <jima at fedoraproject.org> 2.31-1.fc3.1
+- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux
+
 * Mon May  8 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.31-1
 - Removed dbus config patch (now provided upstream)
 - Patched in init script (no longer provided upstream)