From: Jakub Ružička <jakub.ruzicka@nic.cz>
Date: Mon, 9 Sep 2024 10:24:37 +0000 (+0200)
Subject: distro/pkg: update for new python modules layout
X-Git-Tag: v6.0.9~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae1b9828cb74845c0ff955dcf42948ba9ff8238c;p=thirdparty%2Fknot-resolver.git

distro/pkg: update for new python modules layout

Old knot_resolver module is now knot_resolver_build_options.

Old knot_resolver_manager module is now just knot_resolver.
---

diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
index 2ec3dbe2c..a682d79b1 100755
--- a/distro/pkg/deb/rules
+++ b/distro/pkg/deb/rules
@@ -36,16 +36,16 @@ override_dh_auto_build:
 		-Dc_link_args="$${LDFLAGS}"
 	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_resolver_manager PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
 		dh_auto_build --buildsystem=pybuild
+	PYBUILD_NAME=knot_resolver_build_options PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
+		dh_auto_build --buildsystem=pybuild --sourcedirectory build_deb/python
 
 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
+	PYBUILD_NAME=knot_resolver_build_options PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
+		dh_auto_install --buildsystem=pybuild --sourcedirectory build_deb/python
 	install -m 644 -D etc/config/config.yaml debian/tmp/etc/knot-resolver/config.yaml
 
 override_dh_auto_test:
diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
index 2f18b28b1..d1ec860c2 100644
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@ -213,12 +213,14 @@ install -m 755 -d %{buildroot}/%{_pkgdocdir}
 mv %{buildroot}/%{_datadir}/doc/%{name}/* %{buildroot}/%{_pkgdocdir}/
 %endif
 
+# install knot_resolver python module
+%py3_install
+
+# install knot_resolver_build_options python module
 pushd build_rpm/python
 %py3_install
 popd
 
-# install knot-resolver-manager
-%py3_install
 install -m 644 -D etc/config/config.yaml %{buildroot}%{_sysconfdir}/knot-resolver/config.yaml
 
 %pre
@@ -299,13 +301,13 @@ getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysc
 %{_libdir}/knot-resolver/kres_modules/view.lua
 %{_libdir}/knot-resolver/kres_modules/watchdog.lua
 %{_libdir}/knot-resolver/kres_modules/workarounds.lua
-%{python3_sitelib}/knot_resolver.py
-%{python3_sitelib}/knot_resolver-*
-%{python3_sitearch}/knot_resolver_manager*
+%{python3_sitelib}/knot_resolver_build_options.py
+%{python3_sitelib}/knot_resolver_build_options-*
+%{python3_sitearch}/knot_resolver*
 %if 0%{?suse_version}
-%pycache_only %{python3_sitelib}/__pycache__/knot_resolver.*
+%pycache_only %{python3_sitelib}/__pycache__/knot_resolver_build_options.*
 %else
-%{python3_sitelib}/__pycache__/knot_resolver.*
+%{python3_sitelib}/__pycache__/knot_resolver_build_options.*
 %endif
 %{_mandir}/man8/kresd.8.gz
 %{_mandir}/man8/kresctl.8.gz