[ldns/el5/master: 1/2] - Updated to 1.6.8

[Paul Wouters]

commit 7a869ab7a9c15f3e61a05cb61ab1b7c92bb7c73f
Author: Paul Wouters <paul at xelerance.com>
Date:   Mon Jan 24 14:31:00 2011 -0500

    - Updated to 1.6.8

 .gitignore |    6 ++++++
 ldns.spec  |   12 +++++++-----
 sources    |    2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af491d2..8e8d938 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,10 @@ ldns-1.4.0.tar.gz
 ldns-1.5.0.tar.gz
 ldns-1.5.1.tar.gz
 ldns-1.6.4.tar.gz
+<<<<<<< HEAD
 /ldns-1.6.6.tar.gz
+=======
+ldns-1.6.5.tar.gz
+ldns-1.6.6.tar.gz
+/ldns-1.6.8.tar.gz
+>>>>>>> 670883b... - Updated to 1.6.8
diff --git a/ldns.spec b/ldns.spec
index e9fe633..8575e9d 100644
--- a/ldns.spec
+++ b/ldns.spec
@@ -7,7 +7,7 @@
 
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.6.6
+Version: 1.6.8
 Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
@@ -55,13 +55,13 @@ Python extensions for ldns
 #autoreconf 
 
 %build
-%configure --disable-rpath --disable-static --with-sha2 \
+%configure --disable-rpath --disable-static --with-sha2 --disable-gost \
 %if %{with_python}
  --with-pyldns
 %endif
 
-(cd drill ; %configure --disable-rpath --disable-static --with-ldns=%{buildroot}/lib/ )
-(cd examples ; %configure --disable-rpath --disable-static --with-ldns=%{buildroot}/lib/ )
+(cd drill ; %configure --disable-rpath --disable-static --with-sha2 --disable-gost --with-ldns=%{buildroot}/lib/ )
+(cd examples ; %configure --disable-rpath --disable-static --with-sha2 --disable-gost --with-ldns=%{buildroot}/lib/ )
 
 make %{?_smp_mflags} 
 ( cd drill ; make %{?_smp_mflags} )
@@ -99,7 +99,6 @@ rm -rf %{buildroot}
 %{_libdir}/libldns*so.*
 %{_bindir}/drill
 %{_bindir}/ldnsd
-#%{_bindir}/ldns-*
 %{_bindir}/ldns-chaos
 %{_bindir}/ldns-compare-zones
 %{_bindir}/ldns-[d-z]*
@@ -125,6 +124,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Jan 24 2011 Paul Wouters <paul at xelerance.com> - 1.6.8-1
+- Updated to 1.6.8
+
 * Thu Aug 26 2010 Paul Wouters <paul at xelerance.com> - 1.6.6-1
 - Upgraded to 1.6.6
 
diff --git a/sources b/sources
index c9c8c90..3b2d16a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2bff31764c98aa69749070a21199164  ldns-1.6.6.tar.gz
+17d15e0d185a6258eed2c3806d8fc7c5  ldns-1.6.8.tar.gz