From 12d2e725c5c130f3446be1982f5d9c9f1f511737 Mon Sep 17 00:00:00 2001
From: Jan Vcelak <jvcelak@fedoraproject.org>
Date: Mon, 29 Jul 2013 17:54:52 +0200
Subject: [PATCH] update to 1.3.0-rc5

---
 .gitignore                                    |  1 +
 ...default-configuration-file-load-path.patch | 25 -------------------
 knot.spec                                     |  9 ++++---
 sources                                       |  2 +-
 4 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 0001-config-fix-default-configuration-file-load-path.patch

diff --git a/.gitignore b/.gitignore
index 2b926a4..4bb7d64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /knot-1.2.0.tar.gz
 /knot-1.3.0-rc3.tar.gz
 /knot-1.3.0-rc4.tar.gz
+/knot-1.3.0-rc5.tar.gz
diff --git a/0001-config-fix-default-configuration-file-load-path.patch b/0001-config-fix-default-configuration-file-load-path.patch
deleted file mode 100644
index 0184bcc..0000000
--- a/0001-config-fix-default-configuration-file-load-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 432027f7cd31be315d267e073e1034c9737fc419 Mon Sep 17 00:00:00 2001
-From: Jan Vcelak <jan.vcelak@nic.cz>
-Date: Mon, 15 Jul 2013 14:14:49 +0200
-Subject: [PATCH] config: fix default configuration file load path
-
----
- src/knot/conf/conf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/knot/conf/conf.c b/src/knot/conf/conf.c
-index 9830c04..87c9a00 100644
---- a/src/knot/conf/conf.c
-+++ b/src/knot/conf/conf.c
-@@ -37,7 +37,7 @@
- 
- /*! \brief Default config paths. */
- static const char *DEFAULT_CONFIG[] = {
--	SYSCONFDIR "/" "knot.conf",
-+	CONFIG_DIR "/" "knot.conf",
- };
- 
- #define DEFAULT_CONF_COUNT 1 /*!< \brief Number of default config paths. */
--- 
-1.8.3.1
-
diff --git a/knot.spec b/knot.spec
index 351742b..be435d6 100644
--- a/knot.spec
+++ b/knot.spec
@@ -1,10 +1,10 @@
 %global _hardened_build 1
-%global alphatag rc4
+%global alphatag rc5
 
 Summary: An authoritative DNS daemon
 Name: knot
 Version: 1.3.0
-Release: 0.3.%{alphatag}%{?dist}
+Release: 0.4.%{alphatag}%{?dist}
 License: GPLv3
 Group: System Environment/Daemons
 URL: http://www.knot-dns.cz
@@ -12,7 +12,6 @@ Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}-%{alphatag}.tar.
 Source1: %{name}.service
 Source2: %{name}.conf
 Source3: %{name}.tmpfiles
-Patch0: 0001-config-fix-default-configuration-file-load-path.patch
 
 BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel
 BuildRequires: texinfo
@@ -27,7 +26,6 @@ Knot DNS is a high-performance authoritative DNS server implementation.
 
 %prep
 %setup -q -n %{name}-%{version}-%{alphatag}
-%patch0 -p1
 
 %build
 # disable debug code (causes unused warnings)
@@ -95,6 +93,9 @@ fi
 %doc %{_infodir}/%{name}.info.gz
 
 %changelog
+* Mon Jul 29 2013 Jan Vcelak <jvcelak@fedoraproject.org> 1.3.0-0.4.rc5
+- update to 1.3.0-rc5
+
 * Mon Jul 15 2013 Paul Wouters <pwouters@redhat.com> - 1.3.0-0.3.rc4
 - Added Alias=knotd.service alias to service file
 - Added ExecStartPre=/usr/sbin/knotc checkconf to service file
diff --git a/sources b/sources
index 81650fd..26e73fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9175391abd6e0da0076179f92461457  knot-1.3.0-rc4.tar.gz
+adf0c359488a8994aacb64d66ba9ecd8  knot-1.3.0-rc5.tar.gz