From 9281be584f7eeb13e7684d840d902155830fdd44 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Sep 27 2017 06:15:15 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index f3b2c0f..84e2da6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,3 +119,4 @@
 /vim-8.0-1129.tar.bz2
 /vim-8.0-1132.tar.bz2
 /vim-8.0-1144.tar.bz2
+/vim-8.0-1155.tar.bz2
diff --git a/sources b/sources
index 795856c..48468e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-1144.tar.bz2) = 6b910af48f56f34b56b62f68988ada63e3f108034954ce92ab4c1169901cc63bcc40b712ea524805a68652d80297276e1e288fc27e12c9f1578446668ef7859d
+SHA512 (vim-8.0-1155.tar.bz2) = 3042d4c1d9628756d5bece7dc92a79ed577cd13d0171f9650704cc51298e88851ecdcf903d8bc969c516de862518ba4d1454085858cb0677703ff28d45207108
diff --git a/vim.spec b/vim.spec
index ddea353..338f88f 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1144
+%define patchlevel 1155
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -24,7 +24,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@@ -772,6 +772,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Wed Sep 27 2017 Karsten Hopp <karsten@redhat.com> 8.0.1155-1
+- patchlevel 1155
+
 * Tue Sep 26 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1144-2
 - removing README.patches