From fdd77f9ee3a56b494b7ca641cf6ff9a3ecc2d2f0 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Mon, 13 Jul 2015 22:45:42 -0400
Subject: [PATCH] * Tue Jul 14 2015 Paul Wouters <pwouters@redhat.com> -
 1.5.4-1 - Update to 1.5.4 - Removed patches merged into upstream

---
 .gitignore   |  1 +
 sources      |  2 +-
 unbound.spec | 29 +++++++++--------------------
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index dd9508b..2ad36bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ unbound-1.4.5.tar.gz
 /unbound-1.5.1rc1.tar.gz
 /unbound-1.5.1.tar.gz
 /unbound-1.5.3.tar.gz
+/unbound-1.5.4.tar.gz
diff --git a/sources b/sources
index 1d9e224..d46dc85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e95fdcbaaf5dc87432d898006a5eb13  unbound-1.5.3.tar.gz
+f85854baad15adc7ce8acefe6cda4cf8  unbound-1.5.4.tar.gz
diff --git a/unbound.spec b/unbound.spec
index 368ac53..37cc3d3 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -20,8 +20,8 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.5.3
-Release: 8%{?extra_version:.%{extra_version}}%{?dist}
+Version: 1.5.4
+Release: 1%{?extra_version:.%{extra_version}}%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}%{?extra_version}.tar.gz
@@ -44,16 +44,6 @@ Source15: unbound-anchor.timer
 Source16: unbound-munin.README
 Source17: unbound-anchor.service
 
-# https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=664
-Patch0:     0001-Use-print_function-also-for-Python2.patch
-Patch1:     0002-libunbound-examples-produce-sorted-output.patch
-Patch2:     0003-libunbound-Python-libldns-is-not-used-anymore.patch
-Patch3:     0004-Resolve-Python-3-incompatibilities-in-libunbound-and.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1229599
-# https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=675
-Patch4:     0001-SOA-negative-TTL-is-capped-at-minimumttl-in-its-rdat.patch
-Patch5:     0002-Maximum-negative-TTL-patch-configparser-regeneration.patch
-
 Group: System Environment/Daemons
 BuildRequires: flex, openssl-devel
 BuildRequires: libevent-devel expat-devel
@@ -66,7 +56,7 @@ BuildRequires: python3-devel
 BuildRequires: systemd
 # Required for SVN versions
 # BuildRequires: bison
-BuildRequires: automake autoconf libtool
+# BuildRequires: automake autoconf libtool
 
 Requires(post): systemd
 Requires(preun): systemd
@@ -152,14 +142,9 @@ pushd %{pkgname}_python2
 %endif # with_python
 
 #Add patches here
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
-autoreconf -iv
+# only for snapshots
+# autoreconf -iv
 
 %if 0%{with_python}
 # copy common doc files - after here, since it may be patched
@@ -442,6 +427,10 @@ popd
 
 
 %changelog
+* Tue Jul 14 2015 Paul Wouters <pwouters@redhat.com> - 1.5.4-1
+- Update to 1.5.4
+- Removed patches merged into upstream
+
 * Tue Jun 16 2015 Tomas Hozza <thozza@redhat.com> - 1.5.3-8
 - Revert: Use low maximum negative cache TTL (5 sec) (#1229596)