From bc74c1b97e76334847328bf69b7286ad71885693 Mon Sep 17 00:00:00 2001
From: Patrick Laughton <jima@fedoraproject.org>
Date: Mon, 12 Jun 2006 14:30:20 +0000
Subject: [PATCH] Update to 2.32

---
 .cvsignore                                         |  1 +
 ...le-dbus.patch => dnsmasq-2.32-enable-dbus.patch |  8 ++++----
 ...itscript.patch => dnsmasq-2.32-initscript.patch |  6 +++---
 dnsmasq.spec                                       | 14 +++++++++-----
 sources                                            |  2 +-
 5 files changed, 18 insertions(+), 13 deletions(-)
 rename dnsmasq-2.31-enable-dbus.patch => dnsmasq-2.32-enable-dbus.patch (59%)
 rename dnsmasq-2.31-initscript.patch => dnsmasq-2.32-initscript.patch (88%)

diff --git a/.cvsignore b/.cvsignore
index b8c0589..f9b86f3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 dnsmasq-2.30.tar.gz
 dnsmasq-2.31.tar.gz
+dnsmasq-2.32.tar.gz
diff --git a/dnsmasq-2.31-enable-dbus.patch b/dnsmasq-2.32-enable-dbus.patch
similarity index 59%
rename from dnsmasq-2.31-enable-dbus.patch
rename to dnsmasq-2.32-enable-dbus.patch
index 75d5aa2..2eea4f3 100644
--- a/dnsmasq-2.31-enable-dbus.patch
+++ b/dnsmasq-2.32-enable-dbus.patch
@@ -1,7 +1,7 @@
-diff -urN dnsmasq-2.31/src/config.h dnsmasq-2.31-patched/src/config.h
---- dnsmasq-2.31/src/config.h	2006-05-06 06:18:25.000000000 -0500
-+++ dnsmasq-2.31-patched/src/config.h	2006-05-08 07:26:04.000000000 -0500
-@@ -169,7 +169,7 @@
+diff -urN dnsmasq-2.32/src/config.h dnsmasq-2.32-patched/src/config.h
+--- dnsmasq-2.32/src/config.h	2006-06-09 14:52:06.000000000 -0500
++++ dnsmasq-2.32-patched/src/config.h	2006-06-12 09:07:08.000000000 -0500
+@@ -156,7 +156,7 @@
  /* platform independent options- uncomment to enable */
  /* #define HAVE_BROKEN_RTC */
  /* #define HAVE_ISC_READER */
diff --git a/dnsmasq-2.31-initscript.patch b/dnsmasq-2.32-initscript.patch
similarity index 88%
rename from dnsmasq-2.31-initscript.patch
rename to dnsmasq-2.32-initscript.patch
index bad5547..0ffe130 100644
--- a/dnsmasq-2.31-initscript.patch
+++ b/dnsmasq-2.32-initscript.patch
@@ -1,6 +1,6 @@
-diff -urN dnsmasq-2.31/rpm/dnsmasq.init dnsmasq-2.31-patched/rpm/dnsmasq.init
---- dnsmasq-2.31/rpm/dnsmasq.init	1969-12-31 18:00:00.000000000 -0600
-+++ dnsmasq-2.31-patched/rpm/dnsmasq.init	2006-05-08 07:30:11.000000000 -0500
+diff -urN dnsmasq-2.32/rpm/dnsmasq.init dnsmasq-2.32-patched/rpm/dnsmasq.init
+--- dnsmasq-2.32/rpm/dnsmasq.init	1969-12-31 18:00:00.000000000 -0600
++++ dnsmasq-2.32-patched/rpm/dnsmasq.init	2006-06-12 09:06:09.000000000 -0500
 @@ -0,0 +1,75 @@
 +#!/bin/sh
 +#
diff --git a/dnsmasq.spec b/dnsmasq.spec
index a008033..4f14e59 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -1,5 +1,5 @@
 Name:           dnsmasq
-Version:        2.31
+Version:        2.32
 Release:        1%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
@@ -11,7 +11,7 @@ Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-i
 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 @@ machines.
 %prep
 %setup -q
 %patch0 -p1
-%if "%{dist}" != ".fc3"
+%if "%fedora" > "3" || "%aurora" > "2"
 %patch1 -p1
 %endif
 
@@ -51,7 +51,7 @@ 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"
+%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 @@ fi
 %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,10 @@ fi
 
 
 %changelog
+* Mon Jun 12 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.32-1
+- Update from upstream
+- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux
+
 * Mon May  8 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.31-1
 - Removed dbus config patch (now provided upstream)
 - Patched in init script (no longer provided upstream)
diff --git a/sources b/sources
index 1f2f23f..f4c2441 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26932aec55865b5b4ffe53e7abcf9396  dnsmasq-2.31.tar.gz
+d1f593a8352db1d6ad3dccc9b775295d  dnsmasq-2.32.tar.gz