debian, rhel: Move ovs-flowviz and the man page to appropriate places.

ovs-flowviz script should be shipped in bindir in fedora and the man pages should be shipped in the same python3-openvswitch package for both debian and fedora. Signed-off-by: Ilya Maximets <[email protected]>
igsilya · Oct 21, 2024 · 4a1a36a · 4a1a36a
1 parent 6e82591
commit 4a1a36a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/debian/automake.mk b/debian/automake.mk
@@ -58,6 +58,7 @@ EXTRA_DIST += \
 	debian/ovs-systemd-reload \
 	debian/patches/ovs-ctl-ipsec.patch \
 	debian/patches/series \
+	debian/python3-openvswitch.install \
 	debian/rules \
 	debian/source/format \
 	debian/source/lintian-overrides \

diff --git a/debian/python3-openvswitch.install b/debian/python3-openvswitch.install
@@ -0,0 +1 @@
+usr/share/man/man8/ovs-flowviz.8
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
@@ -246,6 +246,9 @@ install -d -m 0755 $RPM_BUILD_ROOT%{python3_sitelib}
 cp -a $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/* \
    $RPM_BUILD_ROOT%{python3_sitelib}
 
+mv $RPM_BUILD_ROOT%{python3_sitelib}/ovs/flowviz/ovs-flowviz \
+   $RPM_BUILD_ROOT/%{_bindir}/ovs-flowviz
+
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/
 
 install -d -m 0755 $RPM_BUILD_ROOT/%{_sharedstatedir}/openvswitch
@@ -399,6 +402,8 @@ fi
 %{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp
 
 %files -n python3-openvswitch
+%{_bindir}/ovs-flowviz
+%{_mandir}/man8/ovs-flowviz.8*
 %{python3_sitelib}/ovs
 
 %files test
@@ -501,7 +506,6 @@ fi
 %{_mandir}/man8/ovs-ctl.8*
 %{_mandir}/man8/ovs-dpctl.8*
 %{_mandir}/man8/ovs-dpctl-top.8*
-%{_mandir}/man8/ovs-flowviz.8*
 %{_mandir}/man8/ovs-kmod-ctl.8*
 %{_mandir}/man8/ovs-ofctl.8*
 %{_mandir}/man8/ovs-pki.8*