rpms/wireshark
7
0
Fork 0
Code Issues Pull Requests Releases Activity

added back compatibility with RHEL6

Browse Source
This commit is contained in:
Jan Safranek 2012-09-04 16:11:55 +02:00
parent d81c408318
commit d91ac27b6c
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
wireshark.spec
View File

@ -2,18 +2,26 @@
%global with_adns 0 %global with_adns 0
%global with_lua 1 %global with_lua 1
%global with_gtk2 0
%if 0%{?rhel} != 0 %if 0%{?rhel} != 0
%global with_portaudio 0 #RHEL:
%global with_GeoIP 0 %global with_portaudio 0
%global with_GeoIP 0
%if 0%{?rhel} <= 6
# RHEL6: use GTK2
%global with_gtk2 1
%endif
%else %else
%global with_portaudio 1 %global with_portaudio 1
%global with_GeoIP 1 %global with_GeoIP 1
%endif %endif
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.8.2 Version: 1.8.2
Release: 2%{?dist} Release: 3%{?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
@ -38,7 +46,7 @@ BuildRequires: libpcap-devel >= 0.9
BuildRequires: libsmi-devel BuildRequires: libsmi-devel
BuildRequires: zlib-devel, bzip2-devel BuildRequires: zlib-devel, bzip2-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: glib2-devel, gtk3-devel BuildRequires: glib2-devel
BuildRequires: elfutils-devel, krb5-devel BuildRequires: elfutils-devel, krb5-devel
BuildRequires: python, pcre-devel, libselinux BuildRequires: python, pcre-devel, libselinux
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
@ -60,6 +68,11 @@ BuildRequires: portaudio-devel
%if %{with_lua} %if %{with_lua}
BuildRequires: lua-devel BuildRequires: lua-devel
%endif %endif
%if %{with_gtk2}
BuildRequires: gtk2-devel
%else
BuildRequires: gtk3-devel
%endif
# Temporary hack - wireshark-1.8.0 is not compilable with upstream # Temporary hack - wireshark-1.8.0 is not compilable with upstream
# Makefile.in / configure, they need to be regenerated # Makefile.in / configure, they need to be regenerated
@ -73,15 +86,20 @@ Requires: adns
%package gnome %package gnome
Summary: Gnome desktop integration for wireshark Summary: Gnome desktop integration for wireshark
Group: Applications/Internet Group: Applications/Internet
Requires: gtk3
Requires: wireshark = %{version}-%{release} Requires: wireshark = %{version}-%{release}
Requires: xdg-utils Requires: xdg-utils
Requires: GeoIP
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
%if %{with_gtk2}
Requires: gtk2
%else
Requires: gtk3
%endif
%if %{with_portaudio} %if %{with_portaudio}
Requires: portaudio Requires: portaudio
%endif %endif
%if %{with_GeoIP}
Requires: GeoIP
%endif
%package devel %package devel
Summary: Development headers and libraries for wireshark Summary: Development headers and libraries for wireshark
@ -142,7 +160,11 @@ export LDFLAGS="$LDFLAGS -pie"
--with-libsmi \ --with-libsmi \
--with-gnu-ld \ --with-gnu-ld \
--with-pic \ --with-pic \
--with-gtk3 \ %if %{with_gtk2}
--with-gtk2 \
%else
--with-gtk3 \
%endif
%if %{with_adns} %if %{with_adns}
--with-adns \ --with-adns \
%else %else
@ -340,6 +362,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%changelog %changelog
* Tue Sep 4 2012 Jan Safranek <jsafrane@redhat.com> - 1.8.2-3
- added back compatibility with RHEL6
- GeoIP build dependency made also conditional on with_GeoIP variable
* Wed Aug 29 2012 Jan Safranek <jsafrane@redhat.com> - 1.8.2-2 * Wed Aug 29 2012 Jan Safranek <jsafrane@redhat.com> - 1.8.2-2
- fixed "libwireshark.so.1: cannot open shared object file" error - fixed "libwireshark.so.1: cannot open shared object file" error
message on startup message on startup