Merge branch 'master' into epel8

pdns.spec

@@ -3,7 +3,7 @@
 
 Name: pdns
 Version: 4.1.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A modern, advanced and high performance authoritative-only nameserver
 License: GPLv2
 URL: http://powerdns.com
@@ -29,6 +29,8 @@ BuildRequires: systemd-units
 Provides: powerdns = %{version}-%{release}
 %global backends %{backends} bind
 
+Obsoletes: pdns-backend-geoip < 4.1.11-1
+
 %description
 The PowerDNS Nameserver is a modern, advanced and high performance
 authoritative-only nameserver. It is written from scratch and conforms
@@ -101,16 +103,6 @@ BuildRequires: sqlite-devel
 %description backend-sqlite
 This package contains the SQLite backend for %{name}
 
-%package backend-geoip
-Summary: GeoIP backend for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: geoip-devel
-BuildRequires: yaml-cpp-devel
-%global backends %{backends} geoip
-
-%description backend-geoip
-This package contains the GeoIP backend for %{name}
-
 %package backend-mydns
 Summary: MyDNS backend for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -282,9 +274,6 @@ exit 0
 %{_pkgdocdir}/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
 %{_libdir}/%{name}/libgsqlite3backend.so
 
-%files backend-geoip
-%{_libdir}/%{name}/libgeoipbackend.so
-
 %files backend-mydns
 %{_pkgdocdir}/schema.mydns.sql
 %{_libdir}/%{name}/libmydnsbackend.so
@@ -293,6 +282,9 @@ exit 0
 %{_libdir}/%{name}/libtinydnsbackend.so
 
 %changelog
+* Sun Aug 04 2019 Morten Stevens <mstevens@fedoraproject.org> - 4.1.11-2
+- Drop support for backend GeoIP
+
 * Fri Aug 02 2019 Morten Stevens <mstevens@fedoraproject.org> - 4.1.11-1
 - Update to 4.1.11
 - PowerDNS Security Advisory 2019-06 (CVE-2019-10203)