aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-03-06 23:04:43 +0000
committerGerald Combs <gerald@wireshark.org>2013-03-06 23:04:43 +0000
commite5e1372d7e5f86d8b3b2490405c59c0a147cfe5d (patch)
tree7a8c2374c485a4af771cee16dbf935297c1f823e /packaging
parentd56c18f586bde7b13c066d8166876ae4823bf783 (diff)
downloadwireshark-e5e1372d7e5f86d8b3b2490405c59c0a147cfe5d.tar.gz
wireshark-e5e1372d7e5f86d8b3b2490405c59c0a147cfe5d.tar.bz2
wireshark-e5e1372d7e5f86d8b3b2490405c59c0a147cfe5d.zip
Enable c-ares support by default to match the Windows and Debian
packages (and to make things less painful if the user enables name resolution). Untested. svn path=/trunk/; revision=48150
Diffstat (limited to 'packaging')
-rw-r--r--packaging/rpm/SPECS/wireshark.spec.in11
1 files changed, 8 insertions, 3 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in
index ddc878f121..a1178518c1 100644
--- a/packaging/rpm/SPECS/wireshark.spec.in
+++ b/packaging/rpm/SPECS/wireshark.spec.in
@@ -4,6 +4,7 @@
# Set these to 1 if you want to ensure your package inclues support for them:
%global with_adns 0
+%global with_c_ares 1
%global with_lua 1
%global with_portaudio 0
@@ -48,6 +49,10 @@ Requires: libpcap
BuildRequires: zlib-devel
Requires: zlib
+%if %{with_c_ares}
+BuildRequires: c-ares-devel
+Requires: c-ares
+%endif
%if %{with_adns}
BuildRequires: adns-devel
Requires: adns
@@ -64,8 +69,6 @@ Requires: lua
#BuildRequires: libselinux
#BuildRequires: gnutls-devel
#BuildRequires: libcap-devel
-#BuildRequires: c-ares-devel
-#Requires: c-ares
%if %{use_wireshark_group}
Requires(pre): shadow-utils
@@ -126,6 +129,9 @@ Contains the Gnome (GTK+) Wireshark GUI and desktop integration files.
# command-line.
%configure \
--with-gnu-ld \
+%if %{with_c_ares}
+ --with-c-ares \
+%endif
%if %{with_adns}
--with-adns \
%endif
@@ -285,4 +291,3 @@ gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || :
* Sun Nov 15 1998 FastJack <fastjack@i-s-o.net>
- created .spec file
-