From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 24 Oct 2019 14:40:35 +0000 (+0200)
Subject: distro/rpm: move root.keys to proper location
X-Git-Tag: v4.3.0~10^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd66a657bec66ad0fdfc689aa65ab201254e6f0b;p=thirdparty%2Fknot-resolver.git

distro/rpm: move root.keys to proper location

Fixes #513
---

diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index b3d0eb310..1561aa850 100644
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -154,6 +154,8 @@ CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" meson build_rpm \
     -Dclient=enabled \
     -Dunit_tests=enabled \
     -Dmanaged_ta=enabled \
+    -Dkeyfile_default="%{_sharedstatedir}/knot-resolver/root.keys" \
+    -Dinstall_root_keys=enabled \
     -Dinstall_kresd_conf=enabled \
     --buildtype=plain \
     --prefix="%{_prefix}" \
@@ -233,11 +235,12 @@ systemctl daemon-reload
 %doc %{_pkgdocdir}/AUTHORS
 %doc %{_pkgdocdir}/NEWS
 %doc %{_pkgdocdir}/examples
-%attr(775,root,knot-resolver) %dir %{_sysconfdir}/knot-resolver
+%attr(755,root,knot-resolver) %dir %{_sysconfdir}/knot-resolver
 %attr(644,root,knot-resolver) %config(noreplace) %{_sysconfdir}/knot-resolver/kresd.conf
-%attr(664,root,knot-resolver) %config(noreplace) %{_sysconfdir}/knot-resolver/root.keys
 %attr(644,root,knot-resolver) %config(noreplace) %{_sysconfdir}/knot-resolver/root.hints
 %attr(644,root,knot-resolver) %config(noreplace) %{_sysconfdir}/knot-resolver/icann-ca.pem
+%attr(775,root,knot-resolver) %dir %{_sharedstatedir}/knot-resolver
+%attr(664,root,knot-resolver) %{_sharedstatedir}/knot-resolver/root.keys
 %{_unitdir}/kresd@.service
 %{_unitdir}/kres-cache-gc.service
 %{_unitdir}/kresd.target