From 79bf045e692d6ced26160f31e385214ecf9735ba Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: May 19 2017 07:24:18 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index 4617085..3e8483f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,4 @@
 /vim-8.0-597.tar.bz2
 /vim-8.0-598.tar.bz2
 /vim-8.0-599.tar.bz2
+/vim-8.0-600.tar.bz2
diff --git a/README.patches b/README.patches
index 2740865..93bb907 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,12 @@
+commit 2a0b06def49198aef45ef173f524a638a700f9c9
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu May 18 16:23:43 2017 +0200
+
+    patch 8.0.0600: test_recover fails on some systems
+    
+    Problem:    test_recover fails on some systems.
+    Solution:   Explicitly check if "/" is writable. (Ken Takata)
+
 commit 79a213d6a4e909703524a7f1ad985c7bd40650a6
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Tue May 16 13:15:18 2017 +0200
diff --git a/sources b/sources
index ec790cc..3350248 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-599.tar.bz2) = 763235b9a59bc6695a168fc5bf78cb1370a0cb52973ba2fbcb76eac352e86629d83a7592c18000917de1b3850db0719005110c6458c1591ede1327d06a07d8df
+SHA512 (vim-8.0-600.tar.bz2) = f7a7ef66ceab87f5ba5ee923aef6a54aa886abbdd286b1970d5a98e99a5e961afe4415b28b39c7b8326a700059ab3eae14260c0175a39116caeb48d049953877
diff --git a/vim.spec b/vim.spec
index 0dde155..ea2cbf9 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 599
+%define patchlevel 600
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Fri May 19 2017 Karsten Hopp <karsten@redhat.com> 8.0.600-1
+- patchlevel 600
+
 * Wed May 17 2017 Karsten Hopp <karsten@redhat.com> 8.0.599-1
 - patchlevel 599