From 87d8a4b6ba096793a16914da8f967ceac3446a29 Mon Sep 17 00:00:00 2001
From: Jan Vcelak <jvcelak@fedoraproject.org>
Date: Thu, 18 Jun 2015 17:16:37 +0200
Subject: [PATCH] new upstream pre-release (2.0.0-rc1)

---
 knot.spec | 51 +++++++++++++++++++++++++++++++++++----------------
 sources   |  2 +-
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/knot.spec b/knot.spec
index b7a43c4..45be487 100644
--- a/knot.spec
+++ b/knot.spec
@@ -3,22 +3,21 @@
 
 Summary: High-performance authoritative DNS server
 Name: knot
-Version: 1.99.1
-Release: 4%{?dist}
+Version: 2.0.0
+Release: 0.1.rc1%{?dist}
 License: GPLv3
 Group: System Environment/Daemons
 URL: http://www.knot-dns.cz
-Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz
+Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}-rc1.tar.xz
 Source1: %{name}.service
 Source2: %{name}.conf
 Source3: %{name}.tmpfiles
 
-# Required utilities
-BuildRequires: flex bison
 # Required dependencies
 BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel
 # Optional dependencies
-BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn) pkgconfig(libsystemd-daemon) pkgconfig(libsystemd-journal)
+BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn) pkgconfig(libsystemd-daemon) pkgconfig(libsystemd-journal) pkgconfig(libfstrm) pkgconfig(libprotobuf-c)
+BuildRequires: pkgconfig(bash-completion)
 
 BuildRequires: systemd
 Requires(post): systemd
@@ -63,7 +62,7 @@ Provides: bundled(jquery)
 The package contains documentation for the Knot DNS server.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 
 # make sure embedded LMDB library is not used
 for file in lmdb.h lmdb.c midl.h midl.c; do
@@ -142,13 +141,16 @@ exit 0
 %dir %attr(-,knot,knot) %{_localstatedir}/run/%{name}
 %{_unitdir}/%{name}.service
 %{_tmpfilesdir}/%{name}.conf
-%{_bindir}/keymgr
+%{_libexecdir}/knot1to2
+%{_sbindir}/keymgr
 %{_sbindir}/knotc
 %{_sbindir}/knotd
+%{_mandir}/man1/knot1to2.*
 %{_mandir}/man5/knot.conf.*
 %{_mandir}/man8/keymgr.*
 %{_mandir}/man8/knotc.*
 %{_mandir}/man8/knotd.*
+%{_datadir}/bash-completion/completions/keymgr
 
 %files utils
 %{_bindir}/kdig
@@ -162,26 +164,43 @@ exit 0
 
 %files libs
 %doc COPYING AUTHORS NEWS THANKS
-%{_libdir}/libknot*.so.*
-%{_libdir}/libzscanner*.so.*
-%{_libdir}/libdnssec*.so.*
+%{_libdir}/libdnssec.so.*
+%{_libdir}/libknot.so.*
+%{_libdir}/libzscanner.so.*
 
 %files devel
 %{_includedir}/dnssec
 %{_includedir}/libknot
-%{_libdir}/libknot.so
-%{_libdir}/libknot-int.so
-%{_libdir}/libzscanner.so
 %{_libdir}/libdnssec.so
-%{_libdir}/pkgconfig/libknot.pc
-%{_libdir}/pkgconfig/libknot-int.pc
+%{_libdir}/libknot.so
+%{_libdir}/libzscanner.so
 %{_libdir}/pkgconfig/libdnssec.pc
+%{_libdir}/pkgconfig/libknot.pc
+%{_libdir}/pkgconfig/libzscanner.pc
 
 %files doc
 %dir %{_pkgdocdir}
 %{_pkgdocdir}/html
 
 %changelog
+* Thu Jun 18 2015 Jan Vcelak <jvcelak@fedoraproject.org> 2.0.0-0.1.rc1
+- new upstream pre-release:
+  + fix: lost NOTIFY message if received during zone transfer
+  + fix: kdig, record correct dnstap SocketProtocol when retrying over TCP
+  + fix: kdig, hide TSIG section with +noall
+  + fix: do not set AA flag for AXFR/IXFR queries
+  + feature: new configuration format in YAML, binary store im LMDB
+  + feature: DNSSEC, separate library, switch to GnuTLS, new utilities
+  + feature: DNSSEC, basic KASP support (generate initial keys, ZSK rollover)
+  + feature: zone parser, split long TXT/SPF strings into multiple strings
+  + feature: kdig, add generic dump style option (+generic)
+  + feature: try all master servers on failure in multi-master environment
+  + feature: improved remotes and ACLs (multiple addresses, multiple keys)
+  + feature: basic support for zone file patterns (%s to substitute zone name)
+  + improvement: do not write class for SOA record (unified with other RR types)
+  + improvement: do not write master server address into the zone file
+  + documentation: manual pages also in HTML and PDF format
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.99.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 5541c8a..0a1edb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a37dfc4a4691c7fffb513abe0b2266ee  knot-1.99.1.tar.xz
+c16c2926ed76078869c1b1cec804e418  knot-2.0.0-rc1.tar.xz