[pdns-recursor] Update to 3.5-rc2

[Morten Stevens]

commit f9057c2d346bf53bdca955cc300bfa6ee1fc9d14
Author: Morten Stevens <mstevens at imt-systems.com>
Date:   Tue Mar 5 19:03:29 2013 +0100

    Update to 3.5-rc2

 .gitignore                        |    1 +
 pdns-recursor-fixsysconfdir.patch |    9 ++++-----
 pdns-recursor.spec                |   32 +++++++++++++++++++-------------
 sources                           |    2 +-
 4 files changed, 25 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b279fc2..7f8585b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 pdns-recursor-3.2.tar.bz2
 /pdns-recursor-3.3.tar.bz2
+/pdns-recursor-3.5-rc2.tar.bz2
diff --git a/pdns-recursor-fixsysconfdir.patch b/pdns-recursor-fixsysconfdir.patch
index 7ef909c..89bce6c 100644
--- a/pdns-recursor-fixsysconfdir.patch
+++ b/pdns-recursor-fixsysconfdir.patch
@@ -1,9 +1,8 @@
-diff -up pdns-recursor-3.3/config.h.orig pdns-recursor-3.3/config.h
---- pdns-recursor-3.3/config.h.orig	2010-09-25 16:57:46.364960862 +0200
-+++ pdns-recursor-3.3/config.h	2010-09-25 16:58:00.632960838 +0200
+--- pdns-recursor-3.5-rc2/config.h.orig	2013-02-11 10:13:56.000000000 +0100
++++ pdns-recursor-3.5-rc2/config.h	2013-03-05 18:52:48.575990258 +0100
 @@ -1,4 +1,4 @@
 -#define SYSCONFDIR "/etc/powerdns/" 
-+#define SYSCONFDIR "/etc/pdns-recursor/" 
++#define SYSCONFDIR "/etc/pdns-recursor/"
  #define LOCALSTATEDIR "/var/run/" 
- #define VERSION "3.3"
+ #define VERSION "3.5-rc2"
  #define RECURSOR
diff --git a/pdns-recursor.spec b/pdns-recursor.spec
index c214ace..0a3a774 100644
--- a/pdns-recursor.spec
+++ b/pdns-recursor.spec
@@ -1,33 +1,37 @@
 %global _hardened_build 1
+%global prever rc2
 
 Name: pdns-recursor
-Version: 3.3
-Release: 10%{?dist}
+Version: 3.5
+Release: 0.1.%{?prever}%{?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}.tar.bz2
+Source0: http://downloads.powerdns.com/releases/%{name}-%{version}-%{?prever}.tar.bz2
 Source1: pdns-recursor.service
-Patch0: pdns-recursor-fixmakefile.patch
-Patch1: pdns-recursor-fixsysconfdir.patch
+Patch0: pdns-recursor-fixsysconfdir.patch
+Patch1: pdns-recursor-fixmakefile.patch
+
+Provides: powerdns-recursor = %{version}-%{release}
+BuildRequires: boost-devel
+BuildRequires: lua-devel
+BuildRequires: systemd-units
 
 Requires(pre): shadow-utils
-Requires(post): systemd-units, systemd-sysv
+Requires(post): systemd-sysv
+Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 
-BuildRequires: boost-devel, lua-devel, systemd-units
-Provides: powerdns-recursor = %{version}-%{release}
-
 %description
 PowerDNS Recursor is a non authoritative/recursing DNS server. Use this
 package if you need a dns cache for your network.
 
 %prep
-%setup -q
-%patch0 -p1 -b .fixmakefile
-%patch1 -p1 -b .fixsysconfdir
+%setup -q -n %{name}-%{version}-%{?prever}
+%patch0 -p1 -b .fixsysconfdir
+%patch1 -p1 -b .fixmakefile
 
 %build
 LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" make %{?_smpflags}
@@ -82,6 +86,9 @@ exit 0
 %doc COPYING README
 
 %changelog
+* Tue Mar 05 2013  Morten Stevens <mstevens at imt-systems.com> - 3.5-0.1.rc2
+- Update to 3.5-rc2
+
 * Tue Mar 05 2013 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.3-10
 - Enable hardened build as per http://fedoraproject.org/wiki/Packaging:Guidelines#PIE
 - Fix bogus date in changelog
@@ -186,4 +193,3 @@ exit 0
 
 * Sun Dec 31 2006 <ruben at rubenkerkhof.com> 3.1.4-1
 - Initial import
-
diff --git a/sources b/sources
index 80ada59..dfa01bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87daeeebb6f7af9e07814ff6c43300dd  pdns-recursor-3.3.tar.bz2
+95215c1cebed78b891c25469dff0f59c  pdns-recursor-3.5-rc2.tar.bz2