From a893a6760e83161d08507e13c728cc13d5b112c5352f9e7f84d712339b7e8428 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Sun, 18 Aug 2013 19:54:48 +0000 Subject: [PATCH] Accepting request 195570 from home:AndreasStieger:branches:network:utilities - gtk3 version in openSUSE Factory (13.1) deprecates elements used in wireshark 1.10.1. Revert back to gtk2 UI. OBS-URL: https://build.opensuse.org/request/show/195570 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=95 --- wireshark.changes | 6 ++++++ wireshark.spec | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/wireshark.changes b/wireshark.changes index 884aacf..2ed98bd 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Aug 18 16:18:30 UTC 2013 - andreas.stieger@gmx.de + +- gtk3 version in openSUSE Factory (13.1) deprecates elements used + in wireshark 1.10.1. Revert back to gtk2 UI. + ------------------------------------------------------------------- Sat Jul 27 00:02:02 UTC 2013 - andreas.stieger@gmx.de diff --git a/wireshark.spec b/wireshark.spec index 543c762..19685d6 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -19,6 +19,9 @@ # disable caps for now %define use_caps 0 +# openSUSE Factory gtk3 deprecates gtk2 elements used +%define use_gtk3 0 + Name: wireshark Version: 1.10.1 Release: 0 @@ -42,7 +45,11 @@ BuildRequires: flex %if 0%{?suse_version} <= 1140 BuildRequires: gtk2-devel %else +%if 0%{?use_gtk3} BuildRequires: gtk3-devel +%else +BuildRequires: gtk2-devel +%endif %endif BuildRequires: krb5-devel BuildRequires: libcap-devel @@ -134,7 +141,9 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark --without-zlib \ %endif %if 0%{?suse_version} > 1140 +%if 0%{?use_gtk3} --with-gtk3 \ +%endif %endif --with-ssl \ --with-gnutls=yes \