From f0c74fc548d46e5c54e27fac4e441ebea36b8585 Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel@zhukoff.net>
Date: Wed, 16 Sep 2020 14:26:52 +0200
Subject: [PATCH] New version v1.8.0

---
 .gitignore                |  1 +
 0005-disablenetconf.patch | 12 ------------
 kea.spec                  | 20 ++++++++------------
 sources                   |  2 +-
 4 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 0005-disablenetconf.patch

diff --git a/.gitignore b/.gitignore
index ac643bb..11358ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /kea-1.5.0-P1.tar.gz
 /kea-1.6.0.tar.gz
 /kea-1.7.9.tar.gz
+/kea-1.8.0.tar.gz
diff --git a/0005-disablenetconf.patch b/0005-disablenetconf.patch
deleted file mode 100644
index bc81a3a..0000000
--- a/0005-disablenetconf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- kea-1.6.0.new/doc/sphinx/Makefile.am	2019-09-11 15:13:01.480900859 -0400
-+++ kea-1.6.0.new/doc/sphinx/Makefile.am	2019-09-11 15:14:05.066858096 -0400
-@@ -63,7 +63,9 @@
- rst_man_sources+=man/kea-dhcp6.8.rst
- rst_man_sources+=man/kea-dhcp-ddns.8.rst
- rst_man_sources+=man/kea-lfc.8.rst
-+if HAVE_SYSREPO
- rst_man_sources+=man/kea-netconf.8.rst
-+endif
- rst_man_sources+=man/kea-shell.8.rst
- rst_man_sources+=man/keactrl.8.rst
- rst_man_sources+=man/perfdhcp.8.rst
diff --git a/kea.spec b/kea.spec
index 5db5f13..4ec018d 100644
--- a/kea.spec
+++ b/kea.spec
@@ -5,8 +5,8 @@
 #%%global prever P1
 
 Name:           kea
-Version:        1.7.9
-Release:        3%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        DHCPv4, DHCPv6 and DDNS server from ISC
 
 License:        MPLv2.0 and Boost
@@ -18,7 +18,6 @@ Source3:	kea-dhcp-ddns.service
 Source4:        kea-ctrl-agent.service
 
 Patch3:         0004-Openssl-version.patch
-Patch4:         0005-disablenetconf.patch
 
 # autoreconf
 BuildRequires: autoconf automake libtool
@@ -106,6 +105,7 @@ This package contains shared libraries used by Kea DHCP server.
 
 
 %prep
+rm -rf doc/sphinx/_build
 %autosetup -p1 -n kea-%{version}%{?prever:-%{prever}}
 
 # to be able to build on ppc64(le)
@@ -160,6 +160,7 @@ touch %{buildroot}%{_sharedstatedir}/kea/kea-leases6.csv
 
 rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
+
 mkdir -p %{buildroot}/run
 install -d -m 0755 %{buildroot}/run/kea/
 
@@ -188,7 +189,7 @@ EOF
 
 %files
 %license COPYING
-%doc AUTHORS ChangeLog README CONTRIBUTING.md examples html platforms.rst
+%doc AUTHORS ChangeLog README CONTRIBUTING.md examples html platforms.rst code_of_conduct.md
 %{_bindir}/kea-msg-compiler
 %{_sbindir}/kea-admin
 %{_sbindir}/keactrl
@@ -220,12 +221,6 @@ EOF
 %dir %{_sharedstatedir}/kea
 %config(noreplace) %{_sharedstatedir}/kea/kea-leases4.csv
 %config(noreplace) %{_sharedstatedir}/kea/kea-leases6.csv
-%{_pkgdocdir}/AUTHORS
-%{_pkgdocdir}/ChangeLog
-%{_pkgdocdir}/README
-%{_pkgdocdir}/CONTRIBUTING.md
-%{_pkgdocdir}/examples
-%{_pkgdocdir}/html
 %{python3_sitelib}/%{name}
 %{_mandir}/man8/kea-admin.8.gz
 %{_mandir}/man8/keactrl.8.gz
@@ -236,9 +231,7 @@ EOF
 %{_mandir}/man8/kea-lfc.8.gz
 %{_mandir}/man8/kea-shell.8.gz
 %{_mandir}/man8/perfdhcp.8.gz
-%if %{sysrepo}
 %{_mandir}/man8/kea-netconf.8.gz
-%endif
 %dir /run/kea/
 %{_tmpfilesdir}/kea.conf
 
@@ -297,6 +290,9 @@ EOF
 
 
 %changelog
+* Wed Sep 16 2020 Pavel Zhukov <pzhukov@redhat.com> - 1.8.0-1
+- New version v1.8.0
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 24670bb..0bff19c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kea-1.7.9.tar.gz) = 180e80dbf21789e9c18c69b9e03a2ad4519eb3386cf8c4221a283883eb8151443e888b6a95d1affb0790ef25d6174582448bf590eb2ddadb12b965cba7dc8717
+SHA512 (kea-1.8.0.tar.gz) = a8896ebdb6948851cddca015d696db4ec205af1472ccc25e7fd6d2f9070599cb7f80998f1dc94e763723723e8e0edd8a53274b96630d27db8c40995489d3a883