summaryrefslogtreecommitdiff
path: root/packaging/rpm
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2013-09-20 20:52:04 +0000
committerJeff Morriss <jeff.morriss.ws@gmail.com>2013-09-20 20:52:04 +0000
commitc90d29c668f2045f51a4205a0dc3454208300f76 (patch)
tree48aba5f0315129a2c6dc36188032b4934678a542 /packaging/rpm
parent857dbb03b6fb01b90a42eb57e8bc79a0bced0048 (diff)
downloadwireshark-c90d29c668f2045f51a4205a0dc3454208300f76.tar.gz
As pointed out by Kurt in http://ask.wireshark.org/questions/24886/error-failed-build-dependencies-while-making-rpm :
If we're not building with gtk3 we now need to add --with-gtk2 . svn path=/trunk/; revision=52161
Diffstat (limited to 'packaging/rpm')
-rw-r--r--packaging/rpm/SPECS/wireshark.spec.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in
index fab282dd43..2274660698 100644
--- a/packaging/rpm/SPECS/wireshark.spec.in
+++ b/packaging/rpm/SPECS/wireshark.spec.in
@@ -172,6 +172,8 @@ Contains the Gnome (GTK+) Wireshark GUI and desktop integration files.
%endif
%if %{with_gtk3}
--with-gtk3 \
+%else
+ --with-gtk2 \
%endif
--disable-warnings-as-errors
@@ -278,6 +280,9 @@ gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || :
%{_mandir}/man1/wireshark.*
%changelog
+* Fri Sep 20 2013 Jeff Morriss
+- If we're not using gtk3 add --with-gtk2 (since Wireshark now defaults to gtk3)
+
* Thu Mar 28 2013 Jeff Morriss
- Simplify check for rpmbuild's version.