aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/rpm
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2014-08-13 17:40:16 -0400
committerChristopher Maynard <Christopher.Maynard@gtech.com>2014-08-13 22:29:29 +0000
commita83f67cb85926e42314d25f7ddbbd66dbae5b6ed (patch)
tree4b7a28395726c027b8d4b30c19bb7cc65490202f /packaging/rpm
parente21fbd1397451ce1158bec618f641b54a35db665 (diff)
Use a wildcard to exclude all Wireshark (GUI) binaries: rpmbuild in RHEL6
errors out if you %exclude a file that's not there. Fixes the issue reported by Chris on the -dev list. Change-Id: If8d8b6a9ee69c3d94756b729a809f3c04fc2517f Reviewed-on: https://code.wireshark.org/review/3586 Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com> Petri-Dish: Christopher Maynard <Christopher.Maynard@gtech.com>
Diffstat (limited to 'packaging/rpm')
-rw-r--r--packaging/rpm/SPECS/wireshark.spec.in6
1 files changed, 2 insertions, 4 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in
index 6198ac8bcf..751f1fcb59 100644
--- a/packaging/rpm/SPECS/wireshark.spec.in
+++ b/packaging/rpm/SPECS/wireshark.spec.in
@@ -305,10 +305,8 @@ gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog INSTALL INSTALL.configure NEWS README*
-# Don't pick up the wireshark (GUI) binary here
-%exclude %{_bindir}/wireshark
-%exclude %{_bindir}/wireshark-gtk
-%exclude %{_bindir}/wireshark-qt
+# Don't pick up any of the wireshark (GUI) binaries here
+%exclude %{_bindir}/wireshark*
%{_bindir}/*
# This generates a warning because dumpcap is listed twice. That's