resolve merge conflict

ldns.spec

@@ -56,13 +56,6 @@ BuildRequires: perl-ExtUtils-MakeMaker
 %endif
 Requires: ca-certificates
 
-# Transition: To ensure people who installed 'ldns' for binaries don't lose them. Remove in f21
-Obsoletes: ldns < 1.6.17-4
-Conflicts: ldns < 1.6.17-4
-Provides: ldns = %{version}-%{release}
-Provides: ldns%{?_isa} = %{version}-%{release}
-Requires: ldns-utils
-
 %description
 ldns is a library with the aim to simplify DNS programming in C. All
 low-level DNS/DNSSEC operations are supported. We also define a higher
@@ -91,8 +84,6 @@ Collection of tools to get, check or alter DNS(SEC) data.
 Summary: Python extensions for ldns
 Group: Applications/System
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: ldns-python < 1.6.17-4
-Conflicts: ldns-python < 1.6.17-4
 
 
 %description -n python-ldns
@@ -105,8 +96,6 @@ Summary: Perl extensions for ldns
 Group: Applications/System
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Obsoletes: ldns-perl < 1.6.17-4
-Conflicts: ldns-perl < 1.6.17-4
 
 %description -n perl-ldns
 Perl extensions for ldns
@@ -281,8 +270,9 @@ rm -rf %{buildroot}
 %doc doc
 
 %changelog
-* Tue Jun 16 2015 Paul Wouters <pwouters@redhat.com> - 1.6.17-15
-- rebuilt to fix: perl-ldns requires perl(:MODULE_COMPAT_5.20.2)
+* Wed Jun 17 2015 Paul Wouters <pwouters@redhat.com> - 1.6.17-15
+- Remove obsoleted Obsolete:s
+- Fix for man page generation
 
 * Sat Jun 06 2015 Paul Wouters <pwouters@redhat.com> - 1.6.17-14
 - rebuilt with --enable-rrtype-cds --enable-rrtype-uri enabled