pavlix pushed to dnsmasq (f21). "new version 2.75"

From 68c179ea5c52b3acc89107b59cfa685e21d81a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <psimerda(a)redhat.com&gt;
Date: Wed, 5 Aug 2015 16:09:49 +0200
Subject: new version 2.75

---
 .gitignore                       |  1 +
 dnsmasq-2.72-configuration.patch | 10 ----------
 dnsmasq.spec                     | 12 +++++-------
 sources                          |  2 +-
 4 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 dnsmasq-2.72-configuration.patch

diff --git a/.gitignore b/.gitignore
index c16cb9f..5a695d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ dnsmasq-2.52.tar.lzma
 /dnsmasq-2.70.tar.xz
 /dnsmasq-2.71.tar.xz
 /dnsmasq-2.72.tar.xz
+/dnsmasq-2.75.tar.xz
diff --git a/dnsmasq-2.72-configuration.patch b/dnsmasq-2.72-configuration.patch
deleted file mode 100644
index 109235b..0000000
--- a/dnsmasq-2.72-configuration.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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 38202f2..876d817 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -12,8 +12,8 @@
 %define _hardened_build 1
 
 Name:           dnsmasq
-Version:        2.72
-Release:        4%{?extraversion:.%{extraversion}}%{?dist}
+Version:        2.75
+Release:        1%{?extraversion:.%{extraversion}}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -22,9 +22,6 @@ URL:            http://www.thekelleys.org.uk/dnsmasq/
 Source0:       
http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
 Source1:        %{name}.service
 
-# Patches
-Patch1:         dnsmasq-2.72-configuration.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -59,8 +56,6 @@ 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"
@@ -142,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Wed Aug 05 2015 Pavel Šimerda <psimerda(a)redhat.com&gt; - 2.75-1
+- new version 2.75
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; -
2.72-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index cd63e2a..5de2d4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0256e0a71e27c8d8a5c89a0d18f3cfe2  dnsmasq-2.72.tar.xz
+887236f1ddde6eb57cdb9d01916c9f72  dnsmasq-2.75.tar.xz
-- 
cgit v0.11.2


	http://pkgs.fedoraproject.org/cgit/dnsmasq.git/commit/?h=f21&id=68c17...