diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2021-03-30 00:17:25 +0100 |
|---|---|---|
| committer | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2021-03-30 03:00:17 +0100 |
| commit | 5dd15cd56c6f448134e8b1a6fa0353fa10ebad02 (patch) | |
| tree | 35bbad31f5e8a76b046be4f64b6d4e82c02039b9 /packaging/rpm | |
| parent | 5848d8a6f2b93fd8246d31957a56f90428f2e61d (diff) | |
| download | wireshark-5dd15cd56c6f448134e8b1a6fa0353fa10ebad02.tar.gz wireshark-5dd15cd56c6f448134e8b1a6fa0353fa10ebad02.tar.bz2 wireshark-5dd15cd56c6f448134e8b1a6fa0353fa10ebad02.zip | |
RPM: Don't install HTML manuals twice
Fixes e4d4814168405c1eaea94ebf75883e7b166b9eba.
Diffstat (limited to 'packaging/rpm')
| -rw-r--r-- | packaging/rpm/wireshark.spec.in | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in index 781ef942fe..0b713be07f 100644 --- a/packaging/rpm/wireshark.spec.in +++ b/packaging/rpm/wireshark.spec.in @@ -475,8 +475,13 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %doc AUTHORS COPYING ChangeLog INSTALL NEWS README* # Include the User Guide: -%docdir %{_datadir}/wireshark/ -%{_datadir}/wireshark/ +%if %{with guides} +%docdir %{_datadir}/doc/wireshark/ +# HTML manuals are installed to %{_datadir}/wireshark because that is +# where Wireshark's Help menu expects to launch them from. +%exclude %{_datadir}/doc/wireshark/*.html +%{_datadir}/doc/wireshark/ +%endif # Don't pick up any of the wireshark (GUI) binaries here %exclude %{_bindir}/wireshark* @@ -543,8 +548,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/wireshark.pc %changelog -* Mon Mar 29 2021 Gerald Combs -- Update HTML documenatation location +* Mon Mar 29 2021 Joao Valverde +- Update HTML documentation location * Thu Nov 26 2020 Gerald Combs - Bison is no longer required |