From e1d140eaffc005f8e4c1b76ffb52cbf7a2ae15df Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Apr 20 2016 03:30:40 +0000
Subject: * Wed Apr 20 2016 Paul Wouters <pwouters@redhat.com> - 2.1.0.0-1

- Updated to 2.1.0.0 (rhbz#1305929)
- Remove incorporated patches
- Updated example query file with upstream
- Fixup bad changelog dates
- Use gunzip not bunzip2 as upstream query file is only gzipped

---

diff --git a/.gitignore b/.gitignore
index fd521dd..f077d12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 dnsperf-src-1.0.1.0-1.tar.gz
 /dnsperf-src-2.0.0.0-1.tar.gz
 /queryfile-example-10million-201202.bz2
+/queryfile-example-current.gz
+/dnsperf-src-2.1.0.0-1.tar.gz
diff --git a/dnsperf.spec b/dnsperf.spec
index c58c3b3..e2a387d 100644
--- a/dnsperf.spec
+++ b/dnsperf.spec
@@ -1,16 +1,14 @@
 Summary: Benchmarking authorative and recursing DNS servers
 Name: dnsperf
-Version: 2.0.0.0
-Release: 20%{?dist}
+Version: 2.1.0.0
+Release: 1%{?dist}
 License: MIT
 Url: http://www.nominum.com/support/measurement-tools/
 Source: ftp://ftp.nominum.com/pub/nominum/dnsperf/%{version}/dnsperf-src-%{version}-1.tar.gz
 Source2: bind9-hmacsha.h
-Source3: queryfile-example-10million-201202.bz2
-Patch1: dnsperf-usage.patch
+Source3: queryfile-example-current.gz
 Group: Applications/Internet
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: bind-devel >= 9.3.0, libcap-devel, bzip2, openssl-devel
+BuildRequires: bind-devel >= 9.3.0, libcap-devel, gzip, openssl-devel
 BuildRequires: krb5-devel, libxml2-devel, GeoIP-devel
 Requires: gnuplot pcapy python-dns
 
@@ -20,7 +18,6 @@ For more information, see the dnsperf(1) and resperf(1) man pages.
 
 %prep
 %setup -q -n dnsperf-src-%{version}-1
-%patch1 -p1
 cp %{SOURCE2} hmacsha.h
 %configure 
 sed -i "s/<isc\/hmacsha.h>/\"hmacsha.h\"/" dns.c
@@ -36,7 +33,7 @@ install -D -m 644 contrib/queryparse/queryparse.1 %{buildroot}/%{_mandir}/man1/q
 gzip %{buildroot}/%{_mandir}/man1/queryparse.1
 
 mkdir -p %{buildroot}%{_datadir}/%{name}
-bunzip2 -c %{SOURCE3} > %{buildroot}%{_datadir}/%{name}/queryfile-example-current
+gunzip -c %{SOURCE3} > %{buildroot}%{_datadir}/%{name}/queryfile-example-current
 chmod 644 %{buildroot}%{_datadir}/%{name}/queryfile-example-current
 
 %clean
@@ -51,6 +48,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/dnsperf/queryfile-example-current
 
 %changelog
+* Wed Apr 20 2016 Paul Wouters <pwouters@redhat.com> - 2.1.0.0-1
+- Updated to 2.1.0.0 (rhbz#1305929)
+- Remove incorporated patches
+- Updated example query file with upstream
+- Fixup bad changelog dates
+- Use gunzip not bunzip2 as upstream query file is only gzipped
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0.0-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
@@ -134,7 +138,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Tue May 24 2011 Paul Wouters <paul@xelerance.com> - 1.0.1.0-24
 - rebuilt for newer bind
 
-* Tue Feb 21 2011 Adam Tkac <atkac redhat com> - 1.0.1.0-23
+* Mon Feb 21 2011 Adam Tkac <atkac redhat com> - 1.0.1.0-23
 - rebuild against new bind
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1.0-22
@@ -192,7 +196,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Mon Nov 10 2008 Adam Tkac <atkac redhat com> - 1.0.1.0-5
 - rebuild against new bind-libs
 
-* Wed Oct 31 2008 Paul Wouters <paul@xelerance.com> - 1.0.1.0-4
+* Fri Oct 31 2008 Paul Wouters <paul@xelerance.com> - 1.0.1.0-4
 - Changed license from BSD to MIT
 
 * Wed Oct 22 2008 Paul Wouters <paul@xelerance.com> - 1.0.1.0-3
diff --git a/sources b/sources
index 3e66762..0f3b48e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6d0ff10264e9df25a18bf0678521e1fb  dnsperf-src-2.0.0.0-1.tar.gz
-0ff3de3eaf30a4ed94031fb89997369a  queryfile-example-10million-201202.bz2
+851024fb2d6320ae126b0dcc4f5bb578  queryfile-example-current.gz
+3079da9873651b3459a646336333b34e  dnsperf-src-2.1.0.0-1.tar.gz