From 5648f15f9b04e880440b77a8ad1aa14ab00c9a7d Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Jan 23 2018 14:24:29 +0000
Subject: add root.hints file and update documentation


---

diff --git a/knot-resolver.spec b/knot-resolver.spec
index c82bee9..d91e795 100644
--- a/knot-resolver.spec
+++ b/knot-resolver.spec
@@ -25,6 +25,7 @@ Source103:      kresd-tls.socket
 Source104:      kresd.tmpfiles
 
 # PGP keys used to sign upstream releases
+# Export with --armor using command from https://fedoraproject.org/wiki/PackagingDrafts:GPGSignatures
 # Don't forget to update %prep section when adding/removing keys
 Source1000:     gpgkey-B6006460B60A80E782062449E747DF1F9575A3AA.gpg.asc
 Source1001:     gpgkey-BE26EBB9CBE059B3910CA35BCE8DD6A1A50A21E4.gpg.asc
@@ -116,7 +117,6 @@ make doc
 install -m 0755 -d %{buildroot}%{_pkgdocdir}
 mv %{buildroot}%{_sysconfdir}/kresd/config.* %{buildroot}%{_pkgdocdir}
 chmod 0644 %{buildroot}%{_pkgdocdir}/config.*
-rm -vr %{buildroot}%{_sysconfdir}/kresd
 
 # install configuration files
 mkdir -p %{buildroot}%{_sysconfdir}
@@ -150,11 +150,11 @@ getent passwd kresd >/dev/null || useradd -r -g kresd -d %{_sysconfdir}/kresd -s
 exit 0
 
 %post
-%systemd_post kresd.service
+%systemd_post kresd.service kresd.socket
 /sbin/ldconfig
 
 %preun
-%systemd_preun kresd.service
+%systemd_preun kresd.service kresd.socket
 
 %postun
 %systemd_postun_with_restart kresd.service
@@ -166,6 +166,8 @@ exit 0
 %attr(775,root,kresd) %dir %{_sysconfdir}/kresd
 %attr(644,root,kresd) %config(noreplace) %{_sysconfdir}/kresd/config
 %attr(664,root,kresd) %config(noreplace) %{_sysconfdir}/kresd/root.keys
+%attr(644,root,kresd) %config(noreplace) %{_sysconfdir}/kresd/root.hints
+%attr(644,root,kresd) %{_sysconfdir}/kresd/icann-ca.pem
 %attr(750,kresd,kresd) %dir %{_rundir}/kresd
 %{_unitdir}/kresd.service
 %{_unitdir}/kresd*.socket
@@ -188,6 +190,7 @@ exit 0
 * Fri Jan 05 2018 Tomas Krizek <tomas.krizek@nic.cz> - 1.5.0-2
 - add doc package
 - configure tarball signature verification
+- add root.hints file
 
 * Mon Nov 06 2017 Petr Špaček <petr.spacek@nic.cz> - 1.5.0-1
 - New upstream release 1.5.0
@@ -443,7 +446,7 @@ Bugfixes
   + Metrics exported in Prometheus
   + DNS firewall module
   + Explicit CNAME target fetching in strict mode
-  + Query minimisation improvements 
+  + Query minimisation improvements
   + Improved integration with systemd
 
 * Tue May 31 2016 Jan Vcelak <jvcelak@fedoraproject.org> - 1.0.0-1
diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 0000000..295aeb7
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,22 @@
+Package tests
+=============
+
+These tests implement the standard test interface in Fedora CI.
+See https://fedoraproject.org/wiki/CI/Tests for details.
+
+Manual execution
+----------------
+
+Run the following command on your machine. Please note, it will make
+modifications to your system. It's best to run these on a clean, throw-away
+testing system or a VM.
+
+ansible-playbook tests/tests.yml -e subjects=/path/to/knot-resolver.rpm -e artifacts=/path/to/artifacts
+
+Automatic execution
+-------------------
+
+These tests should eventually be automatically executed by the Fedora CI
+pipeline. As of 2018-01-10, it is not supported for packages that aren't part
+of Fedora Atomic. Once it is implemented, the results of these tests should be
+visible in dist-git commits on src.fedoraproject.org