Accepting request 145774 from network:utilities

- build with gtk3 on 11.4+
- disable zlib makes a sense for 1.2.5 only
- turn some features on (python, gcrypt, gnutls, plugins dir) (forwarded request 145724 from mvyskocil)

OBS-URL: https://build.opensuse.org/request/show/145774
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=63

wireshark.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec 18 09:45:25 UTC 2012 - mvyskocil@suse.com
+
+- build with gtk3 on 11.4+
+- disable zlib makes a sense for 1.2.5 only
+- turn some features on (python, gcrypt, gnutls, plugins dir)
+
 -------------------------------------------------------------------
 Mon Dec 10 09:29:02 UTC 2012 - dimstar@opensuse.org
 

wireshark.spec

@@ -39,7 +39,11 @@ Patch5:         wireshark-suidflags.patch
 BuildRequires:  bison
 BuildRequires:  cairo-devel
 BuildRequires:  flex
+%if 0%{?suse_version} <= 1140
 BuildRequires:  gtk2-devel
+%else
+BuildRequires:  gtk3-devel
+%endif
 BuildRequires:  krb5-devel
 BuildRequires:  libcap-devel
 BuildRequires:  libcares-devel
@@ -59,10 +63,12 @@ BuildRequires:  net-snmp-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pcre-devel
 BuildRequires:  portaudio-devel
-BuildRequires:  python
+BuildRequires:  python-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  xdg-utils
+%if 0%{?suse_version} > 1220
 BuildRequires:  zlib-devel
+%endif
 Requires:       xdg-utils
 Provides:       ethereal = %{version}
 Obsoletes:      ethereal < %{version}
@@ -116,7 +122,21 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark
 autoreconf -fiv
 export SUID_CFLAGS="-fPIE"
 export SUID_LDFLAGS="-pie"
-%configure --without-zlib
+
+# zlib-1.2.5 does not work well with wireshark, so disable it on pre-12.2
+%configure \
+%if 0%{?suse_version} < 1220
+    --without-zlib \
+%endif
+%if 0%{?suse_version} > 1140
+    --with-gtk3 \
+%endif
+    --with-ssl \
+    --with-gnutls=yes \
+    --with-gcrypt=yes \
+    --with-python \
+    --with-plugins=%{_libdir}/%{name}/plugins/%{version}
+
 make %{?_smp_mflags}
 
 %install