osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

rpm: unconditionally add doc files. 

The doc files have been added in v2.9.1rc0-618-g1bb1ffa9ca, and since
then, rpm builds complain:

RPM build errors:
    File listed twice: /usr/local/bin/dumpcap
    Installed (but unpackaged) file(s) found:
    /usr/local/share/doc/wireshark/androiddump.html
    /usr/local/share/doc/wireshark/capinfos.html
    /usr/local/share/doc/wireshark/captype.html
    [cut]

The "with ninja" condition has been removed as well since it leads to a
dead end.

Change-Id: I95185ba8cb0d488a7fd222c04ff7ff2a637a817a
Reviewed-on: https://code.wireshark.org/review/31873
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
This commit is contained in:
Dario Lombardo 2019-02-03 22:25:15 +01:00
parent 8176b492d8
commit ac77bcc61e
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/rpm/wireshark.spec.in
View File

@ -377,17 +377,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README*
%if %{with guides}
# Include the User Guide:
%if %{with ninja}
%docdir %{_datadir}/doc/Wireshark/
%{_datadir}/doc/Wireshark/
%else
%docdir %{_datadir}/doc/wireshark/
%{_datadir}/doc/wireshark/
%else
%endif
%endif
# Don't pick up any of the wireshark (GUI) binaries here
%exclude %{_bindir}/wireshark*