From 862a5d89fb77d3cd39d0cf8b23c1de05b46cdd62 Mon Sep 17 00:00:00 2001
From: Morten Stevens <mstevens@imt-systems.com>
Date: Sep 30 2014 11:52:11 +0000
Subject: Update to 3.4.0


---

diff --git a/.gitignore b/.gitignore
index 9869d81..eb8f6c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ pdns-2.9.22.tar.gz
 /pdns-3.3.1.tar.gz
 /pdns-3.4.0-rc1.tar.bz2
 /pdns-3.4.0-rc2.tar.bz2
+/pdns-3.4.0.tar.bz2
diff --git a/pdns-systemd.patch b/pdns-systemd.patch
new file mode 100644
index 0000000..15423a8
--- /dev/null
+++ b/pdns-systemd.patch
@@ -0,0 +1,11 @@
+--- pdns-3.4.0/contrib/systemd-pdns.service.orig	2014-09-02 10:02:05.000000000 +0200
++++ pdns-3.4.0/contrib/systemd-pdns.service	2014-09-30 13:10:07.441999290 +0200
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=PowerDNS Authoritative Server
+ Wants=network-online.target
+-After=network-online.target mysqld.service postgresql.service slapd.service
++After=network-online.target mariadb.service postgresql.service slapd.service
+ 
+ [Service]
+ Type=forking
diff --git a/pdns.service b/pdns.service
deleted file mode 100644
index 5b5fa56..0000000
--- a/pdns.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=PowerDNS Authoritative Server
-After=network.target mysqld.service postgresql.service slapd.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/pdns_server --daemon
-ExecStop=/usr/bin/pdns_control quit
-Restart=on-failure
-RestartSec=2
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pdns.spec b/pdns.spec
index a7a4060..0315901 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -1,17 +1,16 @@
 %global _hardened_build 1
 %global backends %{nil}
-%global prever rc2
 
 Name: pdns
 Version: 3.4.0
-Release: 0.3.%{?prever}%{?dist}
+Release: 1%{?dist}
 Summary: A modern, advanced and high performance authoritative-only nameserver
 Group: System Environment/Daemons
 License: GPLv2
 URL: http://powerdns.com
-Source0: http://downloads.powerdns.com/releases/%{name}-%{version}-%{?prever}.tar.bz2
-Source1: pdns.service
+Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
 Patch0: pdns-default-config.patch
+Patch1: pdns-systemd.patch
 
 Requires(pre): shadow-utils
 Requires(post): systemd-sysv
@@ -132,8 +131,9 @@ BuildRequires: opendbx-devel
 This package contains the opendbx backend for %{name}
 
 %prep
-%setup -q -n %{name}-%{version}-%{?prever}
+%setup -q
 %patch0 -p1 -b .default-config-patch
+%patch1 -p1 -b .systemd-patch
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED"
@@ -225,6 +225,7 @@ exit 0
 %{_mandir}/man8/dnsscope.8.gz
 %{_mandir}/man8/dnswasher.8.gz
 %{_mandir}/man1/dnstcpbench.1.gz
+%{_mandir}/man1/dnsdist.1.gz
 
 %files backend-mysql
 %doc modules/gmysqlbackend/schema.mysql.sql
@@ -264,6 +265,9 @@ exit 0
 %{_libdir}/%{name}/libopendbxbackend.so
 
 %changelog
+* Tue Sep 30 2014 Morten Stevens <mstevens@imt-systems.com> - 3.4.0-1
+- Update to 3.4.0
+
 * Tue Sep 23 2014 Morten Stevens <mstevens@imt-systems.com> - 3.4.0-0.3.rc2
 - Update to 3.4.0-rc2
 
diff --git a/sources b/sources
index b82f730..7aeb8dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f1b6f452936d4f5f1dbc981bfede3b1  pdns-3.4.0-rc2.tar.bz2
+d60cd0789cfcb20e7277fccb89840ac7  pdns-3.4.0.tar.bz2