From 3480fdb8cf2bb25e881c28f3a47219d203c01bed128b1a9b5b8a1883ea3e5c7f Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Wed, 24 Feb 2016 13:25:15 +0000
Subject: [PATCH] Accepting request 360180 from Base:System

- follow the work in the unbound package and use the
  libunbound-devel symbol for the buildrequires. we override it for
  the distro build with libunbound-devel-mini to avoid build loops. (forwarded request 360179 from darix)

OBS-URL: https://build.opensuse.org/request/show/360180
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=89
---
 gnutls.changes | 13 +++++++++++++
 gnutls.spec    | 36 ++++++++++++++++++++++--------------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/gnutls.changes b/gnutls.changes
index e25fffe..55b6149 100644
--- a/gnutls.changes
+++ b/gnutls.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Feb 18 16:00:30 UTC 2016 - mrueckert@suse.de
+
+- follow the work in the unbound package and use the
+  libunbound-devel symbol for the buildrequires. we override it for
+  the distro build with libunbound-devel-mini to avoid build loops.
+
+-------------------------------------------------------------------
+Mon Feb  1 22:07:00 UTC 2016 - meissner@suse.com
+
+- reenable dane support, require unbound-devel bsc#964346
+- split out libgnutls-dane-devel to try to avoid build cycle.
+
 -------------------------------------------------------------------
 Mon Jan 18 13:25:54 UTC 2016 - idonmez@suse.com
 
diff --git a/gnutls.spec b/gnutls.spec
index 4c52afd..f3b9747 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -22,7 +22,7 @@
 %if %{with gnutls_openssl_compat}
 %define gnutls_ossl_sover 27
 %endif
-%bcond_with dane
+%bcond_without dane
 %if %{with dane}
 %define gnutls_dane_sover 0
 %endif
@@ -52,7 +52,7 @@ BuildRequires:  libtool
 BuildRequires:  trousers-devel
 %endif
 %if %{with dane}
-BuildRequires:  unbound-devel
+BuildRequires:  libunbound-devel
 Requires:       libgnutls-dane%{gnutls_dane_sover} = %{version}
 %endif
 # disabled ppc - valgrind crashes on email cert tests currently. Marcus 20150413
@@ -129,14 +129,22 @@ Group:          Development/Libraries/C and C++
 PreReq:         %install_info_prereq
 Requires:       glibc-devel
 Requires:       libgnutls%{gnutls_sover} = %{version}
-%if %{with dane}
-Requires:       libgnutls-dane%{gnutls_dane_sover} = %{version}
-%endif
 Provides:       gnutls-devel = %{version}-%{release}
 
 %description -n libgnutls-devel
 Files needed for software development using gnutls.
 
+%if %{with dane}
+%package -n libgnutls-dane-devel
+Summary:        Development package for gnutls dane
+License:        LGPL-2.1+
+Group:          Development/Libraries/C and C++
+Requires:       libgnutls-dane%{gnutls_dane_sover} = %{version}
+
+%description -n libgnutls-dane-devel
+Files needed for software development using gnutls.
+%endif
+
 %package -n libgnutlsxx-devel
 Summary:        Development package for gnutls
 License:        LGPL-2.1+
@@ -290,9 +298,6 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_includedir}/%{name}/abstract.h
 %{_includedir}/%{name}/crypto.h
 %{_includedir}/%{name}/compat.h
-%if %{with dane}
-%{_includedir}/%{name}/dane.h
-%endif
 %{_includedir}/%{name}/dtls.h
 %{_includedir}/%{name}/gnutls.h
 %{_includedir}/%{name}/openpgp.h
@@ -307,17 +312,20 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_includedir}/%{name}/system-keys.h
 %{_includedir}/%{name}/urls.h
 %{_libdir}/libgnutls.so
-%if %{with dane}
-%{_libdir}/libgnutls-dane.so
-%endif
 %{_libdir}/pkgconfig/gnutls.pc
-%if %{with dane}
-%{_libdir}/pkgconfig/gnutls-dane.pc
-%endif
 %{_mandir}/man3/*
 %{_infodir}/*.*
 %doc %{_docdir}/libgnutls-devel
 
+%if %{with dane}
+%files -n libgnutls-dane-devel
+%defattr(-, root, root)
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/dane.h
+%{_libdir}/pkgconfig/gnutls-dane.pc
+%{_libdir}/libgnutls-dane.so
+%endif
+
 %files -n libgnutlsxx-devel
 %defattr(-, root, root)
 %{_libdir}/libgnutlsxx.so