distro/pkg: the manager paths fixes

diff --git a/distro/pkg/arch/PKGBUILD b/distro/pkg/arch/PKGBUILD
index 422da69569c8fee29392bcd32e686cc59d648cfd..6f473ca55a50468f27b9be8810ddfe22a8164b86 100644 (file)
--- a/distro/pkg/arch/PKGBUILD
+++ b/distro/pkg/arch/PKGBUILD
@@ -66,9 +66,7 @@ build() {
     pushd build/python
     python -Pm build --wheel --no-isolation
     popd
-    pushd manager
     python -Pm build --wheel --no-isolation
-    popd
 }
 
 check() {
@@ -93,11 +91,7 @@ package() {
     popd
 
     # install knot-resolver-manager
-    pushd manager
     python -Pm installer --destdir="$pkgdir" dist/*.whl
-    install -m 644 -D etc/knot-resolver/config.yaml ${pkgdir}/etc/knot-resolver/config.yaml
-    install -m 644 -D shell-completion/client.bash ${pkgdir}/usr/share/bash-completion/completions/kresctl
-    install -m 644 -D shell-completion/client.fish ${pkgdir}/usr/share/fish/completions/kresctl.fish
-    popd
+    install -m 644 -D etc/config/config.yaml ${pkgdir}/etc/knot-resolver/config.yaml
 
 }

diff --git a/distro/pkg/deb/knot-resolver6.install b/distro/pkg/deb/knot-resolver6.install
index 29d23032f04b9f60c9b7e04fcdd7e34f61a7c000..7b9d0c41428bf178f3d920a3812d5979c5c787ad 100644 (file)
--- a/distro/pkg/deb/knot-resolver6.install
+++ b/distro/pkg/deb/knot-resolver6.install
@@ -34,5 +34,3 @@ usr/lib/systemd/system/knot-resolver.service
 usr/lib/tmpfiles.d/knot-resolver.conf
 usr/sbin/kres-cache-gc
 usr/sbin/kresd
-usr/share/bash-completion/completions/kresctl
-usr/share/fish/completions/kresctl.fish

diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
index 037d7663730a5fd0fdc44e06f60921af7961eb8c..7f4bfb16fe2be5d9969e6b7587d6eeb8297059f6 100755 (executable)
--- a/distro/pkg/deb/rules
+++ b/distro/pkg/deb/rules
@@ -37,18 +37,16 @@ override_dh_auto_build:
        ninja -v -C build_deb
        PYBUILD_NAME=knot_resolver PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
                dh_auto_build --buildsystem=pybuild --sourcedirectory build_deb/python
-       PYBUILD_NAME=knot_resoolver_manager PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
-               dh_auto_build --buildsystem=pybuild --sourcedirectory manager
+       PYBUILD_NAME=knot_resolver_manager PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
+               dh_auto_build --buildsystem=pybuild
 
 override_dh_auto_install:
        DESTDIR="$(shell pwd)/debian/tmp" ninja -v -C build_deb install
        PYBUILD_NAME=knot_resolver PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
                dh_auto_install --buildsystem=pybuild --sourcedirectory build_deb/python
        PYBUILD_NAME=knot_resolver_manager PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
-               dh_auto_install --buildsystem=pybuild --sourcedirectory manager
-       install -m 644 -D manager/etc/knot-resolver/config.yaml debian/tmp/etc/knot-resolver/config.yaml
-       install -m 644 -D manager/shell-completion/client.bash debian/tmp/usr/share/bash-completion/completions/kresctl
-       install -m 644 -D manager/shell-completion/client.fish debian/tmp/usr/share/fish/completions/kresctl.fish
+               dh_auto_install --buildsystem=pybuild
+       install -m 644 -D etc/config/config.yaml debian/tmp/etc/knot-resolver/config.yaml
 
 override_dh_auto_test:
        meson test -C build_deb

diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
index de962e8cdddfd4931bac95d030e9787895612808..2f18b28b19990e036d3e50339b2104d70e0c0f89 100644 (file)
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@ -185,9 +185,7 @@ pushd build_rpm/python
 %py3_build
 popd
 
-pushd manager
 %py3_build
-popd
 
 %install
 DESTDIR="${RPM_BUILD_ROOT}" %{NINJA} -v -C build_rpm install
@@ -220,13 +218,8 @@ pushd build_rpm/python
 popd
 
 # install knot-resolver-manager
-pushd manager
 %py3_install
-install -m 644 -D etc/knot-resolver/config.yaml %{buildroot}%{_sysconfdir}/knot-resolver/config.yaml
-install -m 644 -D shell-completion/client.bash %{buildroot}%{_datarootdir}/bash-completion/completions/kresctl
-install -m 644 -D shell-completion/client.fish %{buildroot}%{_datarootdir}/fish/completions/kresctl.fish
-
-popd
+install -m 644 -D etc/config/config.yaml %{buildroot}%{_sysconfdir}/knot-resolver/config.yaml
 
 %pre
 getent group knot-resolver >/dev/null || groupadd -r knot-resolver
@@ -316,8 +309,6 @@ getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysc
 %endif
 %{_mandir}/man8/kresd.8.gz
 %{_mandir}/man8/kresctl.8.gz
-%{_datarootdir}/bash-completion/completions/kresctl
-%{_datarootdir}/fish/completions/kresctl.fish
 
 %files devel
 %{_includedir}/libkres