new version 2.75

This commit is contained in:
Pavel Šimerda 2015-08-05 16:09:49 +02:00
parent aca4e7adb5
commit 68c179ea5c
4 changed files with 7 additions and 18 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -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

View File

@ -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}%{?extraversion}.tar.xz
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@redhat.com> - 2.75-1
- new version 2.75
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.72-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

View File

@ -1 +1 @@
0256e0a71e27c8d8a5c89a0d18f3cfe2 dnsmasq-2.72.tar.xz
887236f1ddde6eb57cdb9d01916c9f72 dnsmasq-2.75.tar.xz