[wireshark] added wspy_dissectors directory to the package enabled zlib support tuned configure options so it's

[Jan Šafránek]

commit e0d0dbd9c05ad15669c1da9c2bd21864d6e786f1
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Thu Jun 9 14:56:59 2011 +0200

    added wspy_dissectors directory to the package
    enabled zlib support
    tuned configure options so it's clear in wireshark's 'about' box that capabilities are used

 wireshark-1.6.0-soname.patch |   17 +++++++++++++++++
 wireshark.spec               |   18 ++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/wireshark-1.6.0-soname.patch b/wireshark-1.6.0-soname.patch
new file mode 100644
index 0000000..95f063d
--- /dev/null
+++ b/wireshark-1.6.0-soname.patch
@@ -0,0 +1,17 @@
+Load correct shared object name in python.
+This fixes following error message shown by wireshark/tshark when wireshark-devel
+was not installed:
+   libwireshark.so: cannot open shared object file: No such file or directory
+
+diff -up wireshark-1.6.0/epan/wspython/wspy_libws.py.soname wireshark-1.6.0/epan/wspython/wspy_libws.py
+--- wireshark-1.6.0/epan/wspython/wspy_libws.py.soname	2011-06-09 14:40:04.562726728 +0200
++++ wireshark-1.6.0/epan/wspython/wspy_libws.py	2011-06-09 14:40:09.775467946 +0200
+@@ -35,7 +35,7 @@ def get_libws_libname():
+   elif system == "Windows":
+     return 'libwireshark.dll'
+   else:
+-    return 'libwireshark.so'
++    return 'libwireshark.so.1'
+ 
+ def get_libws_handle():
+   global __libwireshark
diff --git a/wireshark.spec b/wireshark.spec
index 981d6e9..d06fc4b 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -11,7 +11,7 @@
 Summary:	Network traffic analyzer
 Name:		wireshark
 Version:	1.6.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL+
 Group:		Applications/Internet
 Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -29,6 +29,7 @@ Patch1:		wireshark-nfsv41-cleanup.patch
 Patch2:		wireshark-1.2.4-enable_lua.patch
 Patch3:		wireshark-libtool-pie.patch
 Patch4:		wireshark-1.4.2-group-msg.patch
+Patch5:		wireshark-1.6.0-soname.patch
 
 Url:		http://www.wireshark.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -104,6 +105,7 @@ and plugins.
 
 %patch3 -p1
 %patch4 -p1 -b .group-msg
+%patch5 -p1 -b .soname
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -137,7 +139,9 @@ export LDFLAGS="$LDFLAGS -pie"
    --disable-warnings-as-errors \
    --with-python \
    --with-plugins=%{_libdir}/%{name}/plugins/%{version} \
-   --with-zlib=no
+   --with-dumpcap-group="wireshark" \
+   --enable-setcap-install \
+   --enable-airpcap
 
 #remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -229,6 +233,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/%{version}/*.la
 # Remove .la files in libdir
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
+# add wspy_dissectors directory for plugins
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/%{name}/python/%{version}/wspy_dissectors
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -321,6 +328,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_sbindir}/idl2wrs
 
 %changelog
+* Thu Jun  9 2011 Jan Safranek <jsafrane at redhat.com> - 1.6.0-2
+- added wspy_dissectors directory to the package
+  - other packages can add Python plugins there
+  - as side effect, removed following message:
+    [Errno 2] No such file or directory: '/usr/lib64/wireshark/python/1.6.0/wspy_dissectors'
+- enabled zlib support
+
 * Wed Jun  8 2011 Jan Safranek <jsafrane at redhat.com> - 1.6.0-1
 - upgrade to 1.6.0
 - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.0.html