| Message ID | 20241021192427.1549951-4-i.maximets@ovn.org |
|---|---|
| State | Accepted |
| Commit | 19ee88ef0fd50de213b64d03c565d989f67ccdc5 |
| Headers | show |
| Series | python: Packaging improvements for ovs-flowviz. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
On 21 Oct 2024, at 21:23, Ilya Maximets wrote: > 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 <i.maximets@ovn.org> Thanks for fixing these. The changes look good to me. Acked-by: Eelco Chaudron <echaudro@redhat.com>
diff --git a/debian/automake.mk b/debian/automake.mk index 5fcefea91..fe8febdd3 100644 --- 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 new file mode 100644 index 000000000..e1e8c3a6e --- /dev/null +++ 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 index 1706d65b2..3f42a5536 100644 --- 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*
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 <i.maximets@ovn.org> --- debian/automake.mk | 1 + debian/python3-openvswitch.install | 1 + rhel/openvswitch-fedora.spec.in | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 debian/python3-openvswitch.install