From f18b71a8d5149b736109b66695068afa6cde8155 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Aug 18 2015 14:34:36 +0000
Subject: Ver. 1.12.7


- Ver. 1.12.7
- Dropped patch no. 11 (applied upstream)

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---

diff --git a/.gitignore b/.gitignore
index 5a7ea2b..6b4a524 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ wireshark-1.2.10.tar.bz2
 /wireshark-1.12.4.tar.bz2
 /wireshark-1.12.5.tar.bz2
 /wireshark-1.12.6.tar.bz2
+/wireshark-1.12.7.tar.bz2
diff --git a/sources b/sources
index 2648479..8238fbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-25ad2bc1c2a21396827c238fcff51bf3  wireshark-1.12.6.tar.bz2
+c8ae53f648b1dcbf6e74495401a0f1ab  wireshark-1.12.7.tar.bz2
diff --git a/wireshark-0011-Disable-overlay-scrolling.patch b/wireshark-0011-Disable-overlay-scrolling.patch
deleted file mode 100644
index 866977c..0000000
--- a/wireshark-0011-Disable-overlay-scrolling.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
-index 66f756f..f05f8de 100644
---- a/ui/gtk/gui_utils.c
-+++ b/ui/gtk/gui_utils.c
-@@ -770,6 +770,9 @@ setup_scrolled_window(GtkWidget *scrollw)
- {
-     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollw),
-                                    GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-+#if GTK_CHECK_VERSION(3,16,0)
-+        gtk_scrolled_window_set_overlay_scrolling(GTK_SCROLLED_WINDOW(scrollw), FALSE);
-+#endif /* OVERLAY_SCROLLING */
- 
-     scrolled_windows = g_list_append(scrolled_windows, scrollw);
- 
diff --git a/wireshark.spec b/wireshark.spec
index a8d99e0..657003e 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -20,8 +20,8 @@
 
 Summary:	Network traffic analyzer
 Name:		wireshark
-Version:	1.12.6
-Release:	4%{?dist}
+Version:	1.12.7
+Release:	1%{?dist}
 License:	GPL+
 Group:		Applications/Internet
 Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -45,7 +45,6 @@ Patch8:		wireshark-0008-move-default-temporary-directory-to-var-tmp.patch
 # Fedora-specific
 Patch9:		wireshark-0009-Fix-paths-in-a-wireshark.desktop-file.patch
 Patch10:	wireshark-0010-gdk.patch
-Patch11:	wireshark-0011-Disable-overlay-scrolling.patch
 
 Url:		http://www.wireshark.org/
 BuildRequires:	libpcap-devel >= 0.9
@@ -167,7 +166,6 @@ Cflags: -I\${includedir}" > wireshark.pc.in
 %patch8 -p1 -b .tmp_dir
 %patch9 -p1 -b .fix_paths
 %patch10 -p1 -b .gdk
-%patch11 -p1 -b .overlay_scrolling
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -408,6 +406,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Aug 18 2015 Peter Lemenkov <lemenkov@gmail.com> - 1.12.7-1
+- Ver. 1.12.7
+- Dropped patch no. 11 (applied upstream)
+
 * Tue Jun 30 2015 Peter Hatina <phatina@redhat.com> - 1.12.6-4
 - Move plugins to %{_libdir}/wireshark/plugins to avoid
   transaction conflicts