[wireshark/f18] upgrade to 1.8.4

[Peter Hatina]

commit 575e110b706dee9e68961148409eeb0c6502d7d8
Author: Peter Hatina <phatina at redhat.com>
Date:   Mon Dec 3 09:12:37 2012 +0100

    upgrade to 1.8.4

 .gitignore                      |    1 +
 sources                         |    2 +-
 wireshark-dissector-table.patch |   21 ---------------------
 wireshark.spec                  |   14 ++++++++------
 4 files changed, 10 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2e3e873..ea0d1e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ wireshark-1.2.10.tar.bz2
 /wireshark-1.8.1.tar.bz2
 /wireshark-1.8.2.tar.bz2
 /wireshark-1.8.3.tar.bz2
+/wireshark-1.8.4.tar.bz2
diff --git a/sources b/sources
index a4fb033..1e5cca0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-898b4c60e32efcd77ecf875a6ad07a92  wireshark-1.8.3.tar.bz2
+ce22aa0fe7ecb5af39c93ff905c7d026  wireshark-1.8.4.tar.bz2
diff --git a/wireshark.spec b/wireshark.spec
index 1f10ad6..793c225 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -12,8 +12,8 @@
 
 Summary:	Network traffic analyzer
 Name:		wireshark
-Version:	1.8.3
-Release:	4%{?dist}
+Version:	1.8.4
+Release:	1%{?dist}
 License:	GPL+
 Group:		Applications/Internet
 Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -31,8 +31,7 @@ Patch2:		wireshark-1.2.4-enable_lua.patch
 Patch3:		wireshark-libtool-pie.patch
 Patch4:		wireshark-1.6.1-group-msg.patch
 Patch5:		wireshark-1.6.0-soname.patch
-Patch6:		wireshark-dissector-table.patch
-Patch7:		wireshark-1.8.2-python-symbols.patch
+Patch6:		wireshark-1.8.2-python-symbols.patch
 
 Url:		http://www.wireshark.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -122,8 +121,7 @@ and plugins.
 %patch3 -p1 -b .v4cleanup
 %patch4 -p1 -b .group-msg
 %patch5 -p1 -b .soname
-%patch6 -p1 -b .dtls
-%patch7 -p1 -b .python-symbols
+%patch6 -p1 -b .python-symbols
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -353,6 +351,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Dec 03 2012 Peter Hatina <phatina at redhat.com> - 1.8.4-1
+- upgrade to 1.8.4
+- see http://www.wireshark.org/docs/relnotes/wireshark-1.8.4.html
+
 * Mon Nov 19 2012 Peter Hatina <phatina at redhat.com> - 1.8.3-4
 - fixed "libwireshark.so.1: cannot open shared object file" error