From 74b5dda1cd4942e476adb8eb75d906fb90e518ed Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Oct 26 2017 09:10:57 +0000 Subject: Merge branch 'f27' --- diff --git a/vim-update.sh b/vim-update.sh index 403a6bc..6cece6a 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -148,6 +148,7 @@ if [ $CHANGES -ne 0 ]; then fi # Increment index and cut the head of releases_regexp string + let "branches_index+=1" let "release_index+=1" releases_regexp=${releases_regexp#*|} done diff --git a/vim.spec b/vim.spec index a9c9816..049c373 100644 --- a/vim.spec +++ b/vim.spec @@ -775,7 +775,6 @@ rm -rf %{buildroot} %changelog * Thu Oct 26 2017 Zdenek Dohnal - 8.0.1216-2 - mention GVim in Summary and Description of vim-x11 subpackage -- update vim-update.sh to merge with the oldest branch * Wed Oct 25 2017 Karsten Hopp 8.0.1216-1 - patchlevel 1216