[wireshark/f14/master] upgrade to 1.4.2

[Jan Šafránek]

commit bbd46db974ad6255ce3dbfcd90e16d4eec58beff
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Mon Nov 22 09:55:53 2010 +0100

    upgrade to 1.4.2

 .gitignore     |    1 +
 sources        |    2 +-
 wireshark.spec |    8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b313bf2..6a3a300 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ wireshark-1.2.9.tar.bz2
 wireshark-1.2.10.tar.bz2
 /wireshark-1.4.0.tar.bz2
 /wireshark-1.4.1.tar.bz2
+/wireshark-1.4.2.tar.bz2
diff --git a/sources b/sources
index 78bcdc7..d00b54d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1719d20a10990e7c2cb261df7021aab6  wireshark-1.4.1.tar.bz2
+5429561935ea0d1ee572793b55446918  wireshark-1.4.2.tar.bz2
diff --git a/wireshark.spec b/wireshark.spec
index 2e2cb29..f42d814 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -12,11 +12,11 @@
 
 Summary:	Network traffic analyzer
 Name:		wireshark
-Version:	1.4.1
+Version:	1.4.2
 %if %{svn_version}
 Release:	0.%{svn_version}%{?dist}
 %else
-Release:	2%{?dist}
+Release:	1%{?dist}
 %endif
 License:	GPL+
 Group:		Applications/Internet
@@ -324,6 +324,10 @@ fi
 %{_sbindir}/idl2wrs
 
 %changelog
+* Mon Nov 22 2010 Jan Safranek <jsafrane at redhat.com> - 1.4.2-1
+- upgrade to 1.4.2
+- see http://www.wireshark.org/docs/relnotes/wireshark-1.4.2.html
+
 * Mon Nov  1 2010 Jan Safranek <jsafrane at redhat.com> - 1.4.1-2
 - temporarily disable zlib until
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4955 is resolved (#643461)