From c81c9a2f4eeca35f99ad312a84aa34f5cb3e6c36 Mon Sep 17 00:00:00 2001
From: Patrick Laughton <jima@fedoraproject.org>
Date: Tue, 15 Aug 2006 20:35:02 +0000
Subject: [PATCH] Update

---
 .cvsignore                                      |  4 +---
 ...dbus.patch => dnsmasq-2.33-enable-dbus.patch |  6 +++---
 ...cript.patch => dnsmasq-2.33-initscript.patch |  6 +++---
 dnsmasq.spec                                    | 17 ++++++++++-------
 sources                                         |  2 +-
 5 files changed, 18 insertions(+), 17 deletions(-)
 rename dnsmasq-2.32-enable-dbus.patch => dnsmasq-2.33-enable-dbus.patch (62%)
 rename dnsmasq-2.32-initscript.patch => dnsmasq-2.33-initscript.patch (88%)

diff --git a/.cvsignore b/.cvsignore
index f9b86f3..b35b8f3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-dnsmasq-2.30.tar.gz
-dnsmasq-2.31.tar.gz
-dnsmasq-2.32.tar.gz
+dnsmasq-2.33.tar.gz
diff --git a/dnsmasq-2.32-enable-dbus.patch b/dnsmasq-2.33-enable-dbus.patch
similarity index 62%
rename from dnsmasq-2.32-enable-dbus.patch
rename to dnsmasq-2.33-enable-dbus.patch
index 2eea4f3..e2b3336 100644
--- a/dnsmasq-2.32-enable-dbus.patch
+++ b/dnsmasq-2.33-enable-dbus.patch
@@ -1,6 +1,6 @@
-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
+diff -urN dnsmasq-2.33/src/config.h dnsmasq-2.33-patched/src/config.h
+--- dnsmasq-2.33/src/config.h	2006-08-04 06:02:36.000000000 -0500
++++ dnsmasq-2.33-patched/src/config.h	2006-08-15 15:14:19.000000000 -0500
 @@ -156,7 +156,7 @@
  /* platform independent options- uncomment to enable */
  /* #define HAVE_BROKEN_RTC */
diff --git a/dnsmasq-2.32-initscript.patch b/dnsmasq-2.33-initscript.patch
similarity index 88%
rename from dnsmasq-2.32-initscript.patch
rename to dnsmasq-2.33-initscript.patch
index 0ffe130..5e3421c 100644
--- a/dnsmasq-2.32-initscript.patch
+++ b/dnsmasq-2.33-initscript.patch
@@ -1,6 +1,6 @@
-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
+diff -urN dnsmasq-2.33/rpm/dnsmasq.init dnsmasq-2.33-patched/rpm/dnsmasq.init
+--- dnsmasq-2.33/rpm/dnsmasq.init	1969-12-31 18:00:00.000000000 -0600
++++ dnsmasq-2.33-patched/rpm/dnsmasq.init	2006-08-15 15:12:17.000000000 -0500
 @@ -0,0 +1,75 @@
 +#!/bin/sh
 +#
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 32fda69..43eda57 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -1,6 +1,6 @@
 Name:           dnsmasq
-Version:        2.32
-Release:        3%{?dist}
+Version:        2.33
+Release:        1%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -15,9 +15,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  dbus-devel
 %endif
 
-BuildRequires:	pkgconfig
+BuildRequires:  pkgconfig
 
-Requires(post):	 /sbin/chkconfig
+Requires(post):  /sbin/chkconfig
 Requires(post):  /sbin/service
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -48,9 +48,9 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 # normally i'd do 'make install'...it's a bit messy, though
 mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \
-	$RPM_BUILD_ROOT%{_mandir}/man8 \
-	$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
-	$RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
+        $RPM_BUILD_ROOT%{_mandir}/man8 \
+        $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
+        $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 "%fedora" > "3" || "%aurora" > "2"
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Tue Aug 15 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.33-1
+- Update
+
 * Sat Jul 22 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.32-3
 - Added pkgconfig BuildReq due to reduced buildroot
 
diff --git a/sources b/sources
index f4c2441..996ed22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1f593a8352db1d6ad3dccc9b775295d  dnsmasq-2.32.tar.gz
+45696461b6e6bc929273b1191ca50447  dnsmasq-2.33.tar.gz