[dnsmasq/f17] New version 2.64

[Tomas Hozza]

commit 2b706080e1f22b58bdda175cfc58f3e8870173ed
Author: Tomas Hozza <thozza at redhat.com>
Date:   Wed Dec 5 16:00:56 2012 +0100

    New version 2.64
    
    - Merged patches dropped
    
    Signed-off-by: Tomas Hozza <thozza at redhat.com>

 .gitignore                              |    1 +
 dnsmasq-2.63-dhcp6-access-control.patch |   91 -------------------------------
 dnsmasq-2.63-ip6-reuseaddr.patch        |   36 ------------
 dnsmasq.spec                            |   14 ++---
 sources                                 |    2 +-
 5 files changed, 8 insertions(+), 136 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c531789..46e1f08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ dnsmasq-2.52.tar.lzma
 /dnsmasq-2.58.tar.lzma
 /dnsmasq-2.59.tar.lzma
 /dnsmasq-2.63.tar.gz
+/dnsmasq-2.64.tar.gz
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 643d840..b6dacef 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -10,8 +10,8 @@
 %endif
 
 Name:           dnsmasq
-Version:        2.63
-Release:        2%{?extraversion}%{?dist}
+Version:        2.64
+Release:        1%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -20,9 +20,6 @@ URL:            http://www.thekelleys.org.uk/dnsmasq/
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.gz
 Source1:        %{name}.service
 
-Patch0:     dnsmasq-2.63-ip6-reuseaddr.patch
-Patch1:     dnsmasq-2.63-dhcp6-access-control.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -56,9 +53,6 @@ query/remove a DHCP server's leases.
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 
-%patch0 -p1 -b .ip6_reuseaddr
-%patch1 -p1 -b .dhcp6_access_ctrl
-
 # use /var/lib/dnsmasq instead of /var/lib/misc
 for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
     sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
@@ -146,6 +140,10 @@ fi
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Wed Dec 05 2012 Tomas Hozza <thozza at redhat.com> - 2.64-1
+- New version 2.64
+- Merged patches dropped
+
 * Mon Nov 19 2012 Tomas Hozza <thozza at redhat.com> - 2.63-2
 - dhcp6 support fixes (#867054)
 - removed "-s $HOSTNAME" from .service file (#753656)
diff --git a/sources b/sources
index caa61a2..99abe27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43e771997615ebcd8f6c6ffa60c3e40b  dnsmasq-2.63.tar.gz
+60adb8e01960a41ce67e0422c4cf9ab3  dnsmasq-2.64.tar.gz