aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/rpm
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2019-02-03 22:25:15 +0100
committerDario Lombardo <lomato@gmail.com>2019-02-05 08:51:50 +0000
commitac77bcc61e345b35581d73b58246da0662500d1d (patch)
treedd8087bf23bfb6364b53d783a828934dedafbc5e /packaging/rpm
parent8176b492d8bacfeb5446f441455da5b2e7449fde (diff)
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>
Diffstat (limited to 'packaging/rpm')
-rw-r--r--packaging/rpm/wireshark.spec.in8
1 files changed, 0 insertions, 8 deletions
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index 8704c31c21..262aee93cb 100644
--- a/packaging/rpm/wireshark.spec.in
+++ b/packaging/rpm/wireshark.spec.in
@@ -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*