From b7a7c006c331c24483661ba5e9d235fae1fadc3f Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@fedoraproject.org>
Date: Wed, 10 Oct 2007 20:15:05 +0000
Subject: [PATCH] - Updated to 1.2.1 - Removed patches that got moved into
 upstream

---
 .cvsignore |  3 +--
 ldns.spec  | 17 ++++++++---------
 sources    |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d2af2e9..d0b12dc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-ldns-1.0.1.tar.gz
-ldns-1.2.0.tar.gz
+ldns-1.2.1.tar.gz
diff --git a/ldns.spec b/ldns.spec
index ffb52b6..61677bb 100644
--- a/ldns.spec
+++ b/ldns.spec
@@ -1,15 +1,13 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.2.0
-Release: 11%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
-Patch0: ldns-1.2.x-key2ds-SHA256.patch
-Patch1: ldns-1.2.0-ldns-key2ds.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen, perl
+BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen, perl libpcap-devel
 
 %description
 ldns is a library with the aim to simplify DNS programing in C. All
@@ -27,8 +25,6 @@ The devel package contains the ldns library and the include files
 
 %prep
 %setup -q 
-%patch0 
-%patch1 -p1
 
 # To built svn snapshots
 #rm config.guess config.sub ltmain.sh
@@ -36,8 +32,6 @@ The devel package contains the ldns library and the include files
 #autoreconf
 
 %configure --disable-rpath
-# mkdir won't work in paralel build
-sed -i 's/then mkdir include/then mkdir -p include/' Makefile
 
 %build
 make %{?_smp_mflags}
@@ -81,6 +75,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/libldns.a
 %dir %{_includedir}/ldns
+%{_includedir}/ldns/*.h
 %doc doc Changelog README
 
 %post -p /sbin/ldconfig
@@ -88,6 +83,10 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Oct 10 2007 Paul Wouters <paul@xelerance.com> - 1.2.1-1
+- Updated to 1.2.1
+- Removed patches that got moved into upstream
+
 * Wed Aug  8 2007 Paul Wouters <paul@xelerance.com> 1.2.0-11
 - Patch for ldns-key2ds to write to stdout
 - Again remove extra set of man pages from doc
diff --git a/sources b/sources
index cd251af..4a4161f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-061315583a26219f7351294758dd2ffb  ldns-1.2.0.tar.gz
+bbb987f1aa4b23a1faed58dc7930dbf0  ldns-1.2.1.tar.gz