dnsmasq-2.76-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10543 ec354946-7b23-47d6-9f5a-488ba84defc7

d/dnsmasq/dnsmasq-vl.spec

@@ -1,18 +1,17 @@
 Name:           dnsmasq
-Version:        2.45
+Version:        2.76
-Release:        3%{?_dist_release}
+Release:        1%{?_dist_release}
 Summary:        A lightweight DHCP/caching DNS server
 Summary(ja):    軽量 DHCP/DNSキャッシュサーバ
 
 Group:          System Environment/Daemons
 License:        GPLv2 or GPLv3
 URL:            http://www.thekelleys.org.uk/dnsmasq/
-Source0:        http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
+Source0:        http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.xz
 Patch0:         %{name}-2.33-initscript.patch
-Patch1:         %{name}-configuration.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:  dbus-devel
+BuildRequires:  dbus-devel, libidn-devel, nettle-devel
 BuildRequires:  pkgconfig
 
 Requires(post):  /sbin/chkconfig
@@ -38,7 +37,31 @@ machines.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1
+
+# 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"
+done
+
+# fix the path to the trust anchor
+sed -i 's|%%%%PREFIX%%%%|%{_prefix}|' dnsmasq.conf.example
+
+#enable dbus
+sed -i 's|/\* #define HAVE_DBUS \*/|#define HAVE_DBUS|g' src/config.h
+
+#enable IDN support
+sed -i 's|/\* #define HAVE_IDN \*/|#define HAVE_IDN|g' src/config.h
+
+#enable DNSSEC support
+sed -i 's|/\* #define HAVE_DNSSEC \*/|#define HAVE_DNSSEC|g' src/config.h
+
+#enable /etc/dnsmasq.d fix bz 526703, ignore RPM backup files
+cat << EOF >> dnsmasq.conf.example
+
+# Include all files in /etc/dnsmasq.d except RPM backup files
+conf-dir=%{_sysconfdir}/dnsmasq.d,.rpmnew,.rpmsave,.rpmorig
+EOF
+
 
 %build
 make %{?_smp_mflags}
@@ -91,7 +114,8 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface
+%license COPYING*
+%doc CHANGELOG FAQ doc.html setup.html dbus/DBus-interface
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
 %dir /etc/dnsmasq.d
 %dir %{_var}/lib/dnsmasq
@@ -102,6 +126,9 @@ fi
 
 
 %changelog
+* Tue Jul  5 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.76-1
+- new upstream release.
+
 * Sat Dec 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.45-3
 - rebuild with VineSeed environment