Some spec file updates

pdns-systemd.patch

@@ -1,22 +0,0 @@
---- pdns-4.0.0-alpha2/contrib/systemd-pdns.service.orig	2016-02-25 15:49:45.000000000 +0100
-+++ pdns-4.0.0-alpha2/contrib/systemd-pdns.service	2016-02-26 21:09:59.426793108 +0100
-@@ -2,7 +2,7 @@
- Description=PowerDNS Authoritative Server
- Documentation=man:pdns_server(8) man:pdns_control(8)
- 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
-@@ -12,10 +12,6 @@ StartLimitInterval=0
- PrivateTmp=true
- PrivateDevices=true
- CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID
--NoNewPrivileges=true
--# ProtectSystem=full will disallow write access to /etc and /usr, possibly
--# not being able to write slaved-zones into sqlite3 or zonefiles.
--ProtectSystem=full
- ProtectHome=true
- RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
- 

pdns.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=PowerDNS Authoritative Server
+Documentation=man:pdns_server(8) man:pdns_control(8)
+Wants=network-online.target
+After=network-online.target mariadb.service postgresql.service slapd.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pdns_server --daemon
+Restart=on-failure
+StartLimitInterval=0
+PrivateTmp=true
+ProtectHome=true
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID
+RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
+
+[Install]
+WantedBy=multi-user.target

pdns.spec

@@ -4,15 +4,15 @@
 
 Name: pdns
 Version: 4.0.0
-Release: 0.4.%{?prever}%{?dist}
+Release: 0.5.%{?prever}%{?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
 Patch0: pdns-default-config.patch
-Patch1: pdns-systemd.patch
-Patch2: pdns-disable-secpoll.patch
+Patch1: pdns-disable-secpoll.patch
 
 Requires(pre): shadow-utils
 Requires(post): systemd-sysv
@@ -23,7 +23,6 @@ Requires(postun): systemd-units
 BuildRequires: systemd-units
 BuildRequires: boost-devel
 BuildRequires: lua-devel
-BuildRequires: cryptopp-devel
 BuildRequires: bison
 BuildRequires: zeromq-devel
 BuildRequires: openssl-devel
@@ -47,7 +46,7 @@ This package contains the extra tools for %{name}
 Summary: MySQL backend for %{name}
 Group: System Environment/Daemons
 Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: community-mysql-devel
+BuildRequires: mariadb-devel
 %global backends %{backends} gmysql
 
 %description backend-mysql
@@ -153,8 +152,7 @@ This package contains the TinyDNS backend for %{name}
 %prep
 %setup -q -n %{name}-%{version}-%{?prever} 
 %patch0 -p1 -b .default-config-patch
-%patch1 -p1 -b .systemd-patch
-%patch2 -p1 -b .disable-secpoll
+%patch1 -p1 -b .disable-secpoll
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED"
@@ -185,11 +183,11 @@ chmod 600 %{buildroot}%{_sysconfdir}/%{name}/pdns.conf
 %{__mv} %{buildroot}/%{_bindir}/zone2ldap %{buildroot}/%{_bindir}/pdns-zone2ldap
 %{__mv} %{buildroot}/%{_mandir}/man1/zone2ldap.1 %{buildroot}/%{_mandir}/man1/pdns-zone2ldap.1
 
-# install systemd unit file
-%{__install} -D -p -m 644 contrib/systemd-pdns.service %{buildroot}%{_unitdir}/%{name}.service
+# Copy systemd service file
+install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/pdns.service
 
-# %check
-# make %{?_smp_mflags} -C pdns check
+%check
+make %{?_smp_mflags} -C pdns check
 
 %pre
 getent group pdns >/dev/null || groupadd -r pdns
@@ -309,6 +307,12 @@ exit 0
 %{_libdir}/%{name}/libtinydnsbackend.so
 
 %changelog
+* Wed Mar 02 2016 Morten Stevens <mstevens@fedoraproject.org> - 4.0.0-0.5.alpha2
+- Added mariadb-devel build dependency
+- Added own systemd unit file
+- Remove cryptopp-devel build dependency
+- Reenable %check
+
 * Fri Feb 26 2016 Morten Stevens <mstevens@fedoraproject.org> - 4.0.0-0.4.alpha2
 - Update to 4.0.0 alpha 2