From 01d3db7f589b5a6be77bff5440b76690781a471d Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Sep 13 2017 06:38:02 +0000
Subject: Merge branch 'f26' into f27


---

diff --git a/.gitignore b/.gitignore
index 13ce2ca..699a710 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,3 +112,4 @@
 /vim-8.0-1071.tar.bz2
 /vim-8.0-1092.tar.bz2
 /vim-8.0-1097.tar.bz2
+/vim-8.0-1098.tar.bz2
diff --git a/README.patches b/README.patches
index 6a284a7..09a165e 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,13 @@
+commit b984b80cd835a483bdca1928bc50eb09b071f373
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Sep 12 22:59:58 2017 +0200
+
+    patch 8.0.1098: build failure if libvterm installed
+    
+    Problem:    Build failure if libvterm installed on the system. (Oleh
+                Hushchenkov)
+    Solution:   Change the CCCTERM argument order. (Ken Takata, closes #2080)
+
 commit 49a613f84aaa7cccd1d12a2ffc4ebb1956f973aa
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Mon Sep 11 23:05:44 2017 +0200
diff --git a/sources b/sources
index 324dfd9..faf72df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-1097.tar.bz2) = 11e2d76b60a745036790a38aa4656b59cf59983e15917185e8a33846472b0b1bd9386170eed9312adfc5ef48f33b5245e6a2a86e0841c331c672516cc969570b
+SHA512 (vim-8.0-1098.tar.bz2) = 0642a8690bea2719d94b02b1fb7685fe93673363da15529ebeae6fd653eac8374a883e43f2eb541d5fdde02c796a9f6b3c7fff74abd5c6e23899b2422a2c6308
diff --git a/vim.spec b/vim.spec
index 27b958e..e504730 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1097
+%define patchlevel 1098
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -774,6 +774,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Wed Sep 13 2017 Karsten Hopp <karsten@redhat.com> 8.0.1098-1
+- patchlevel 1098
+
 * Tue Sep 12 2017 Karsten Hopp <karsten@redhat.com> 8.0.1097-1
 - patchlevel 1097
 - editing vim-update.sh - wrong condition for checking fedkpg push return value