Attachment 608435 Details for Bug 853361 – spec patch

[patch] spec patch

wireshark.spec.diff (text/plain), 2.12 KB, created by David Jaša on 2012-08-31 08:43:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Jaša

Created: 2012-08-31 08:43:18 UTC

Size: 2.12 KB

patch

obsolete

>--- wireshark.spec.orig	2012-08-16 09:33:53.000000000 +0200
>+++ rpmbuild/SPECS/wireshark.spec	2012-08-30 22:46:54.365034076 +0200
>@@ -2,18 +2,25 @@
> 
> %global with_adns 0
> %global with_lua 1
>-%if 0%{?rhel} != 0
>-%global with_portaudio 0
>-%global with_GeoIP 0
>-%else
>+# both are available in epel
>+#%if 0%{?rhel} != 0
>+#%global with_portaudio 0
>+#%global with_GeoIP 0
>+#%else
> %global with_portaudio 1
> %global with_GeoIP 1
>+#%endif
>+
>+%if 0%{?rhel} <= 6
>+%global with_gtk2 1
>+%else
>+%global with_gtk2 0
> %endif
> 
> Summary:	Network traffic analyzer
> Name:		wireshark
> Version:	1.8.2
>-Release:	1%{?dist}
>+Release:	2%{?dist}
> License:	GPL+
> Group:		Applications/Internet
> Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
>@@ -38,7 +45,12 @@
> BuildRequires:	libsmi-devel
> BuildRequires:	zlib-devel, bzip2-devel
> BuildRequires:	openssl-devel
>-BuildRequires:	glib2-devel, gtk3-devel
>+BuildRequires:	glib2-devel
>+%if %{with_gtk2}
>+BuildRequires:	gtk2-devel
>+%else
>+BuildRequires:	gtk3-devel
>+%endif
> BuildRequires:	elfutils-devel, krb5-devel
> BuildRequires:	python, pcre-devel, libselinux
> BuildRequires:	gnutls-devel
>@@ -73,10 +85,14 @@
> %package	gnome
> Summary:	Gnome desktop integration for wireshark
> Group:		Applications/Internet
>-Requires:	gtk3
>+# why the hell is this here, dependency on file doesn't work?
>+#Requires:	gtk3
> Requires:	wireshark = %{version}-%{release}
> Requires:	xdg-utils
>+# conditional was sort of missing here
>+%if %{with_GeoIP}
> Requires:	GeoIP
>+%endif
> Requires:	hicolor-icon-theme
> 
> %if %{with_portaudio}
>@@ -141,7 +157,11 @@
>    --with-libsmi \
>    --with-gnu-ld \
>    --with-pic \
>+%if %{with_gtk2}
>+   --with-gtk2 \
>+%else
>    --with-gtk3 \
>+%endif
> %if %{with_adns}
>    --with-adns \
> %else
>@@ -347,6 +367,11 @@
> %{_datadir}/aclocal/*
> 
> %changelog
>+* Thu Aug 30 2012 David JaÅ¡a <djasa@redhat.com> - 1.8.2-2
>+- added back compatibility with RHEL6 + EPEL 6
>+- GeoIP build dependency made also conditional on with_GeoIP variable
>+- explicit dependency on gtk3 removed
>+
> * Thu Aug 16 2012 Jan Safranek <jsafrane@redhat.com> - 1.8.2-1
> - upgrade to 1.8.2
> - see http://www.wireshark.org/docs/relnotes/wireshark-1.8.2.html

Actions: View | Diff

Attachments on bug 853361: 608435 | 608496