[pdns-recursor] Update to 3.6.0

[Morten Stevens]

commit aaa68c36c8c0cdd4fea5dd5a8f6d639752a3aa73
Author: Morten Stevens <mstevens at imt-systems.com>
Date:   Fri Jun 20 14:33:05 2014 +0200

    Update to 3.6.0

 .gitignore                      |    1 +
 pdns-recursor-fixmakefile.patch |   25 ++++++++++++-------------
 pdns-recursor.spec              |   10 ++++++----
 sources                         |    2 +-
 4 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d707703..7f4dd31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ pdns-recursor-3.2.tar.bz2
 /pdns-recursor-3.5.2.tar.bz2
 /pdns-recursor-3.5.3.tar.bz2
 /pdns-recursor-3.6.0-rc1.tar.bz2
+/pdns-recursor-3.6.0.tar.bz2
diff --git a/pdns-recursor-fixmakefile.patch b/pdns-recursor-fixmakefile.patch
index fc6a382..0e46464 100644
--- a/pdns-recursor-fixmakefile.patch
+++ b/pdns-recursor-fixmakefile.patch
@@ -1,23 +1,22 @@
---- pdns-recursor-git-20140506-1206-81e635d/Makefile.orig	2014-05-06 12:36:12.000000000 +0200
-+++ pdns-recursor-git-20140506-1206-81e635d/Makefile	2014-05-06 15:32:42.671998177 +0200
-@@ -1,7 +1,7 @@
+--- pdns-recursor-3.6.0/Makefile.orig	2014-06-20 11:24:09.000000000 +0200
++++ pdns-recursor-3.6.0/Makefile	2014-06-20 14:18:50.098999662 +0200
+@@ -1,13 +1,13 @@
  # user editable stuff:
  SBINDIR=/usr/sbin/
  BINDIR=/usr/bin/
 -SYSCONFDIR=/etc/powerdns/
-+SYSCONFDIR=/etc/pdns-recursor/
++SYSCONFDIR=/etc/pdns-recursor
  LOCALSTATEDIR=/var/run/
  OPTFLAGS?=-O3
  CXXFLAGS:= $(CXXFLAGS) -Iext/rapidjson/include -I$(CURDIR)/ext/polarssl-1.3.2/include -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread -Iext/yahttp
-@@ -93,15 +93,12 @@ basic_checks: 
- install: build-stamp
- 	-mkdir -p $(DESTDIR)/$(SBINDIR)
- 	mv pdns_recursor $(DESTDIR)/$(SBINDIR)
--	strip $(DESTDIR)/$(SBINDIR)/pdns_recursor
- 	mkdir -p $(DESTDIR)/$(BINDIR)
- 	mv rec_control $(DESTDIR)/$(BINDIR)
--	strip $(DESTDIR)/$(BINDIR)/rec_control
- 	-mkdir -p $(DESTDIR)/$(SYSCONFDIR)
+ CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -I$(CURDIR)/ext/polarssl-1.3.2/include -pthread
+ LDFLAGS:=$(LDFLAGS) $(ARCHFLAGS) -pthread
+-STRIP_BINARIES?=1
++STRIP_BINARIES?=0
+ 
+ LINKCC=$(CXX)
+ CC?=gcc
+@@ -115,7 +115,6 @@ endif
  	$(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(SYSCONFDIR)/recursor.conf-dist
  	-mkdir -p $(DESTDIR)/usr/share/man/man1
  	cp pdns_recursor.1 rec_control.1 $(DESTDIR)/usr/share/man/man1
diff --git a/pdns-recursor.spec b/pdns-recursor.spec
index 2f77bc4..170deb6 100644
--- a/pdns-recursor.spec
+++ b/pdns-recursor.spec
@@ -1,14 +1,13 @@
 %global _hardened_build 1
-%global prever rc1
 
 Name: pdns-recursor
 Version: 3.6.0
-Release: 0.2.%{?prever}%{?dist}
+Release: 1%{?dist}
 Summary: Modern, advanced and high performance recursing/non authoritative name server
 Group: System Environment/Daemons
 License: GPLv2
 URL: http://powerdns.com
-Source0: http://downloads.powerdns.com/releases/%{name}-%{version}-%{?prever}.tar.bz2
+Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
 Source1: pdns-recursor.service
 Patch0: pdns-recursor-fixmakefile.patch
 
@@ -28,7 +27,7 @@ PowerDNS Recursor is a non authoritative/recursing DNS server. Use this
 package if you need a dns cache for your network.
 
 %prep
-%setup -q -n %{name}-%{version}-%{?prever}
+%setup -q
 %patch0 -p1 -b .fixmakefile
 
 %build
@@ -83,6 +82,9 @@ exit 0
 %doc COPYING README
 
 %changelog
+* Fri Jun 20 2014 Morten Stevens <mstevens at imt-systems.com> - 3.6.0-1
+- Update to 3.6.0
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.0-0.2.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 806c6e5..42c632b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-231ef602afa2b3ca1ed87d0b9d5062ec  pdns-recursor-3.6.0-rc1.tar.bz2
+95f21e6d64c1332aeca9fa3f786dd0a2  pdns-recursor-3.6.0.tar.bz2