- Quick fix for contrib/unbound.spec example, no ldns-builtin

        any more.

git-svn-id: file:///svn/unbound/trunk@2462 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/contrib/unbound.spec b/contrib/unbound.spec
index e263e250a19295e890061bd15990c4df7f6ef29f..6064302739388f064be3876060b41b4c0ca52f84 100644 (file)
--- a/contrib/unbound.spec
+++ b/contrib/unbound.spec
@@ -7,8 +7,9 @@ Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
 #Source1: unbound.init
 Group: System Environment/Daemons
+Requires: ldns
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: flex, openssl-devel, expat-devel
+BuildRequires: flex, openssl-devel, expat-devel, ldns-devel
 
 %description
 Unbound is a validating, recursive, and caching DNS resolver.
@@ -28,11 +29,7 @@ The source code is under a BSD License.
 
 # configure with /var/unbound/unbound.conf so that all default chroot, 
 # pidfile and config file are in /var/unbound, ready for chroot jail set up.
-#
-# This is a build using libldns builtin version, the resulting binaries
-# do not require libldns and this package does not have version dependencies.
-# Could be smaller using a dependency on libldns (use --with-ldns=).
-%configure --with-conf-file=%{_localstatedir}/%{name}/unbound.conf --disable-rpath --with-ldns-builtin
+%configure --with-conf-file=%{_localstatedir}/%{name}/unbound.conf --disable-rpath
 
 %build
 #%{__make} %{?_smp_mflags}
@@ -92,6 +89,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Thu Jul 13 2011 Wouter Wijngaards <wouter@nlnetlabs.nl> - 1.4.8
+- ldns required and ldns-devel required for build, no more ldns-builtin.
+
 * Thu Mar 17 2011 Wouter Wijngaards <wouter@nlnetlabs.nl> - 1.4.8
 - removed --disable-gost, assume recent openssl on the destination platform.
 

diff --git a/doc/Changelog b/doc/Changelog
index 5f512f94c5fb750cad624b00c52d2a62074ea1d4..4aaf9c75e7948d8abf1b958d4003c6eb9193a173 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+13 July 2011: Wouter
+       - Quick fix for contrib/unbound.spec example, no ldns-builtin any more.
+
 11 July 2011: Wouter
        - Fix wildcard expansion no-data reply under an optout NSEC3 zone is
          validated as insecure, reported by Jia Li (lijia@cnnic.cn).