From 638c48406a2995636c19e59fa3a6d12eb2a6f38d Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Feb 07 2017 13:05:19 +0000
Subject: Merge branch 'f25'


---

diff --git a/.gitignore b/.gitignore
index 9a0b1b5..2857a17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
 /vim-8.0-275.tar.bz2
 /vim-8.0-297.tar.bz2
 /vim-8.0-311.tar.bz2
+/vim-8.0-314.tar.bz2
diff --git a/README.patches b/README.patches
index f519b98..69a7ee3 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,32 @@
+commit 65189a1294307abf007faab7385dc0145ba72b06
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Feb 6 22:22:17 2017 +0100
+
+    patch 8.0.0314: getcmd*() functions are not tested
+    
+    Problem:    getcmdtype(), getcmdpos() and getcmdline() are not tested.
+    Solution:   Add tests. (Yegappan Lakshmanan)
+
+commit 6f785749db766205616fcf8438f43d1859d8f5e4
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Feb 6 22:11:55 2017 +0100
+
+    patch 8.0.0313: not enough testing for GUI functionality
+    
+    Problem:    Not enough testing for GUI functionality.
+    Solution:   Add tests for the GUI font. (Kazunobu Kuriyama)
+
+commit 88989cc381c764978f7d7c8e387f3efc21333b4b
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Feb 6 21:56:09 2017 +0100
+
+    patch 8.0.0312: failure when a channel receives a split json message
+    
+    Problem:    When a json message arrives in pieces, the start is dropped and
+                the decoding fails.
+    Solution:   Do not drop the start when it is still needed. (Kay Zheng)  Add a
+                test.  Reset the timeout when something is received.
+
 commit 544d3bc9f0e494cb712a33b61558b8e8e12b1e0b
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Feb 5 21:14:50 2017 +0100
diff --git a/sources b/sources
index 0f4d97b..69398a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-311.tar.bz2) = 0198a342b0c212b6c9c119d76791e4de5cd5fa6e42ff97c3d26fff1e5afa66aa2bf594ec9e6c556425ea0098982af94160c32cc83723fe5bdb58ecf73da847f1
+SHA512 (vim-8.0-314.tar.bz2) = 923533e2b9f8f95f3106cd941541f96d737d9fac2004d8235f7a4c992b888e4e247b84aa4b34e7bc66ac8907359809fe27b8f8ae659f5741e595c124348c8f22
diff --git a/vim.spec b/vim.spec
index 5cd9f59..280bfd3 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 311
+%define patchlevel 314
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -173,7 +173,7 @@ Group: Applications/Editors
 Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2.4 gtk3 
 Provides: gvim = %{version}-%{release}
 Provides: mergetool
-BuildRequires: gtk3-devel libSM-devel libXt-devel libXpm-devel
+BuildRequires: gtk3-devel libSM-devel libXt-devel libXpm-devel libappstream-glib
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: hicolor-icon-theme
 
@@ -396,6 +396,11 @@ SentUpstream: 2014-05-22
      editing configuration files.
     </p>
   </description>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/zdohnal/vim/zdohnal-screenshot/gvim16_9.png</image>
+    </screenshot>
+  </screenshots>
   <url type="homepage">http://www.vim.org/</url>
 </application>
 EOF
@@ -435,6 +440,8 @@ EOF
     ln -sf menu_ja_jp.ujis.vim menu_ja_jp.eucjp.vim )
 )
 
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+
 pushd %{buildroot}/%{_datadir}/%{name}/%{vimdir}/tutor
 mkdir conv
    iconv -f CP1252 -t UTF8 tutor.ca > conv/tutor.ca
@@ -758,6 +765,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Tue Feb 07 2017 Karsten Hopp <karsten@redhat.com> 8.0.314-1
+- patchlevel 314, added screenshot to appdata and testing validity of appdata.xml
+
 * Mon Feb 06 2017 Karsten Hopp <karsten@redhat.com> 8.0.311-1
 - patchlevel 311