[dnsmasq/f21] Fix typo in default configuration (#1149459)

[Tomas Hozza]

commit c0cb2fb4293bc9028371f4c3b5fb684334c9da03
Author: Tomas Hozza <thozza(a)redhat.com&gt;
Date:   Mon Oct 6 10:35:08 2014 +0200

    Fix typo in default configuration (#1149459)
    
    Signed-off-by: Tomas Hozza <thozza(a)redhat.com&gt;

 dnsmasq-2.72-configuration.patch |   10 ++++++++++
 dnsmasq.spec                     |    8 +++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/dnsmasq-2.72-configuration.patch b/dnsmasq-2.72-configuration.patch
new file mode 100644
index 0000000..109235b
--- /dev/null
+++ b/dnsmasq-2.72-configuration.patch
@@ -0,0 +1,10 @@
+diff -up dnsmasq-2.72/dnsmasq.conf.example.syntax_err dnsmasq-2.72/dnsmasq.conf.example
+--- dnsmasq-2.72/dnsmasq.conf.example.syntax_err	2014-10-06 10:30:31.841567305 +0200
++++ dnsmasq-2.72/dnsmasq.conf.example	2014-10-06 10:33:51.195697413 +0200
+@@ -645,4 +645,4 @@
+ #conf-dir=/etc/dnsmasq.d,.bak
+ 
+ # Include all files in a directory which end in .conf
+-#conf-dir=/etc/dnsmasq.d/*.conf
+\ No newline at end of file
++#conf-dir=/etc/dnsmasq.d/,*.conf
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 84a5860..537f39d 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -13,7 +13,7 @@
 
 Name:           dnsmasq
 Version:        2.72
-Release:        1%{?extraversion:.%{extraversion}}%{?dist}
+Release:        2%{?extraversion:.%{extraversion}}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -23,6 +23,7 @@ Source0:       
http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{vers
 Source1:        %{name}.service
 
 # Patches
+Patch1:         dnsmasq-2.72-configuration.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,6 +60,8 @@ query/remove a DHCP server's leases.
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 
+%patch1 -p1 -b .syntax_err
+
 # 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"
@@ -141,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Mon Oct 06 2014 Tomas Hozza <thozza(a)redhat.com&gt; - 2.72-2
+- Fix typo in default configuration (#1149459)
+
 * Thu Sep 25 2014 Tomas Hozza <thozza(a)redhat.com&gt; - 2.72-1
 - Update to 2.72 stable