path: root/packaging/rpm
diff options
authorJeff Morriss <jeff.morriss.ws@gmail.com>2014-08-11 16:18:08 -0400
committerJeff Morriss <jeff.morriss.ws@gmail.com>2014-09-02 16:34:00 +0000
commit1a446079d13dae8e4d286677b0458b15558d185d (patch)
treeb04f0c117ecd127225e2ae032c73e3887f7e8072 /packaging/rpm
parentb7fb1167e319ed2b1d1fd37f9844b8bc852ccb0d (diff)
Simplify ./configure logic for telling rpmbuild which GUI(s) we're building.
Rather than checking for all the "--with" arguments just use the "$have_xxx" variables. Don't allow rpmbuild's ./configure to decide to build a GUI just because it's available: make it build only what was ./configure'd. Change-Id: I68582b4c13da7b52d56591dce68ac426e9f607f1 Reviewed-on: https://code.wireshark.org/review/3958 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'packaging/rpm')
1 files changed, 15 insertions, 3 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in
index a397cd0b35..d6be99beb4 100644
--- a/packaging/rpm/SPECS/wireshark.spec.in
+++ b/packaging/rpm/SPECS/wireshark.spec.in
@@ -205,9 +205,21 @@ Contains the Gnome (GTK+) Wireshark GUI and desktop integration files.
%if %{with_portaudio}
--with-portaudio \
- %{?_with_qt} \
- %{?_with_gtk2} \
- %{?_with_gtk3} \
+%if %{with qt}
+ --with-qt \
+ --without-qt \
+%if %{with gtk2}
+ --with-gtk2 \
+ --without-gtk2 \
+%if %{with gtk3}
+ --with-gtk3 \
+ --without-gtk3 \
# Remove rpath. It's prohibited in Fedora[1] and anyway we don't need it (and