diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-11-22 11:16:36 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-11-23 22:45:59 +0000 |
| commit | 451a241e50bd34ba097bd09a5f9f673170779aaf (patch) | |
| tree | cd112515a1ddcd15fb73b1d124e7223d27b1988c /packaging/rpm | |
| parent | 6a0b558ac1da13fffec560c1a522bafbe95517a1 (diff) | |
Add c-ares to the required library list.
Although c-ares support was techically optional, it was either on by
default or required in all of our packaging. Go ahead and require it
globally. C-ares is widely available and synchronous name resolution can
easily result in a horrific user experience.
Change-Id: Id67c797316ed6b8a0ab5052e55a43a1b9e2a2464
Reviewed-on: https://code.wireshark.org/review/35188
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/rpm')
| -rw-r--r-- | packaging/rpm/wireshark.spec.in | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in index cd5aa055d6..b5352eec03 100644 --- a/packaging/rpm/wireshark.spec.in +++ b/packaging/rpm/wireshark.spec.in @@ -12,7 +12,6 @@ %bcond_with lua %bcond_with mmdbresolve %bcond_with lz4_and_snappy -%bcond_with c_ares %bcond_with spandsp %bcond_with bcg729 %bcond_with libxml2 @@ -99,7 +98,6 @@ Requires: snappy %endif %endif -%if %{with c_ares} %if 0%{?suse_version} # SUSE uses these package names (yes 2!): BuildRequires: libcares-devel @@ -110,7 +108,6 @@ Requires: libcares2 BuildRequires: c-ares-devel Requires: c-ares %endif -%endif %if %{with lua} %if 0%{?fedora} @@ -309,11 +306,6 @@ cmake3 \ -DENABLE_LZ4=OFF \ -DENABLE_SNAPPY=OFF \ %endif -%if %{with c_ares} - -DENABLE_CARES=ON \ -%else - -DENABLE_CARES=OFF \ -%endif %if %{with spandsp} -DENABLE_SPANDSP=ON \ %else @@ -505,6 +497,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/wireshark.pc %changelog +* Fri Nov 22 2019 Gerald Combs +- c-ares is a required package + * Thu Aug 15 2019 Gerald Combs - Add zstd |