return to gtk2

This commit is contained in:
Peter Hatina 2013-03-18 11:46:55 +01:00
parent f77839f056
commit 773285dc1b
2 changed files with 5 additions and 1652 deletions

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
%global with_adns 0 %global with_adns 0
%global with_lua 1 %global with_lua 1
%global with_gtk2 0 %global with_gtk2 1
%if 0%{?rhel} != 0 %if 0%{?rhel} != 0
#RHEL: #RHEL:
@ -21,7 +21,7 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.8.6 Version: 1.8.6
Release: 1%{?dist} Release: 2%{?dist}
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@ -40,7 +40,6 @@ Patch3: wireshark-libtool-pie.patch
Patch4: wireshark-1.6.1-group-msg.patch Patch4: wireshark-1.6.1-group-msg.patch
Patch5: wireshark-1.6.0-soname.patch Patch5: wireshark-1.6.0-soname.patch
Patch6: wireshark-1.8.2-python-symbols.patch Patch6: wireshark-1.8.2-python-symbols.patch
Patch7: wireshark-1.8.x-gtk3-layouts.patch
Url: http://www.wireshark.org/ Url: http://www.wireshark.org/
BuildRequires: libpcap-devel >= 0.9 BuildRequires: libpcap-devel >= 0.9
@ -139,7 +138,6 @@ and plugins.
%patch4 -p1 -b .group-msg %patch4 -p1 -b .group-msg
%patch5 -p1 -b .soname %patch5 -p1 -b .soname
%patch6 -p1 -b .python-symbols %patch6 -p1 -b .python-symbols
%patch7 -p1 -b .gtk3-layoyts
%build %build
%ifarch s390 s390x sparcv9 sparc64 %ifarch s390 s390x sparcv9 sparc64
@ -365,6 +363,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%changelog %changelog
* Mon Mar 18 2013 Peter Hatina <phatina@redhat.com> 1.8.6-2
- return to gtk2, stable branch 1.8 is not gtk3 ready
* Tue Mar 12 2013 Peter Hatina <phatina@redhat.com> 1.8.6-1 * Tue Mar 12 2013 Peter Hatina <phatina@redhat.com> 1.8.6-1
- upgrade to 1.8.6 - upgrade to 1.8.6
- see http://www.wireshark.org/docs/relnotes/wireshark-1.8.6.html - see http://www.wireshark.org/docs/relnotes/wireshark-1.8.6.html