Hello community,
here is the log from the commit of package wireshark for openSUSE:Factory
checked in at 2012-12-19 13:56:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireshark (Old)
and /work/SRC/openSUSE:Factory/.wireshark.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wireshark", Maintainer is "cy...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2012-12-14
11:23:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.wireshark.new/wireshark.changes 2012-12-19
13:56:05.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Dec 18 09:45:25 UTC 2012 - mvysko...@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)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.qedLOz/_old 2012-12-19 13:56:07.000000000 +0100
+++ /var/tmp/diff_new_pack.qedLOz/_new 2012-12-19 13:56:07.000000000 +0100
@@ -39,7 +39,11 @@
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: 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 @@
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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
