From 7bec59a493ccb5167ac85198f8171e9df1a1a9f0 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sep 23 2014 10:05:40 +0000 Subject: Update to 3.4.0-rc2 --- diff --git a/.gitignore b/.gitignore index 7d702de..9869d81 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ pdns-2.9.22.tar.gz /pdns-3.3.tar.gz /pdns-3.3.1.tar.gz /pdns-3.4.0-rc1.tar.bz2 +/pdns-3.4.0-rc2.tar.bz2 diff --git a/pdns.service b/pdns.service index 61d6984..5b5fa56 100644 --- a/pdns.service +++ b/pdns.service @@ -9,7 +9,6 @@ ExecStop=/usr/bin/pdns_control quit Restart=on-failure RestartSec=2 PrivateTmp=true -KillMode=none [Install] WantedBy=multi-user.target diff --git a/pdns.spec b/pdns.spec index 1a43b94..a7a4060 100644 --- a/pdns.spec +++ b/pdns.spec @@ -1,10 +1,10 @@ %global _hardened_build 1 %global backends %{nil} -%global prever rc1 +%global prever rc2 Name: pdns Version: 3.4.0 -Release: 0.2.%{?prever}%{?dist} +Release: 0.3.%{?prever}%{?dist} Summary: A modern, advanced and high performance authoritative-only nameserver Group: System Environment/Daemons License: GPLv2 @@ -27,6 +27,7 @@ BuildRequires: bison BuildRequires: polarssl-devel BuildRequires: zeromq-devel Provides: powerdns = %{version}-%{release} +%global backends %{backends} bind %description The PowerDNS Nameserver is a modern, advanced and high performance @@ -161,8 +162,8 @@ make install DESTDIR=%{buildroot} chmod 600 %{buildroot}%{_sysconfdir}/%{name}/pdns.conf -# Copy systemd service file -install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/pdns.service +# install systemd unit file +%{__install} -D -p -m 644 contrib/systemd-pdns.service %{buildroot}%{_unitdir}/%{name}.service %pre getent group pdns >/dev/null || groupadd -r pdns @@ -198,6 +199,7 @@ exit 0 %{_bindir}/zone2sql %{_bindir}/zone2json %{_sbindir}/pdns_server +%{_libdir}/%{name}/libbindbackend.so %{_mandir}/man8/pdns_control.8.gz %{_mandir}/man8/pdns_server.8.gz %{_mandir}/man8/zone2sql.8.gz @@ -262,6 +264,9 @@ exit 0 %{_libdir}/%{name}/libopendbxbackend.so %changelog +* Tue Sep 23 2014 Morten Stevens - 3.4.0-0.3.rc2 +- Update to 3.4.0-rc2 + * Sun Aug 17 2014 Fedora Release Engineering - 3.4.0-0.2.rc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 81db8ab..b82f730 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b83916a597f155296921ac621c48f5e2 pdns-3.4.0-rc1.tar.bz2 +2f1b6f452936d4f5f1dbc981bfede3b1 pdns-3.4.0-rc2.tar.bz2