[wireshark/f12/master] upgrade to 1.2.11 Resolves: #632539

[Jan Šafránek]

commit da4bde20ca2e39155fc590fd7a5dfeefca13a855
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Mon Sep 13 11:23:01 2010 +0200

    upgrade to 1.2.11
    Resolves: #632539

 .gitignore     |    1 +
 sources        |    2 +-
 wireshark.spec |    7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5538e50..3fadfec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 wireshark-1.2.9.tar.bz2
 wireshark-1.2.10.tar.bz2
+/wireshark-1.2.11.tar.bz2
diff --git a/sources b/sources
index 2ae035a..b5b5e1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8bc926956c13fcddb4df0601011ceef  wireshark-1.2.10.tar.bz2
+2a10d31a57d1d4df69400f9373fa7f60  wireshark-1.2.11.tar.bz2
diff --git a/wireshark.spec b/wireshark.spec
index bc4440f..19b5989 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -12,7 +12,7 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.2.10
+Version:	1.2.11
 %if %{svn_version}
 Release: 	0.%{svn_version}%{?dist}
 %else
@@ -324,6 +324,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/idl2wrs
 
 %changelog
+* Mon Sep 13 2010 Jan Safranek <jsafrane at redhat.com> - 1.2.11-1
+- upgrade to 1.2.11
+- see http://www.wireshark.org/docs/relnotes/wireshark-1.2.11.html
+- Resolves: #632539
+
 * Tue Aug 24 2010 Jan Safranek <jsafrane at redhat.com> - 1.2.10-1
 - upgrade to 1.2.10
 - see http://www.wireshark.org/docs/relnotes/wireshark-1.2.10.html