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


---

diff --git a/vim-update.sh b/vim-update.sh
index 2faea55..4d90237 100755
--- a/vim-update.sh
+++ b/vim-update.sh
@@ -6,6 +6,7 @@ releases=( "fc26" "fc26" "fc27" "fc28" )
 branches_count=4
 releases_regexp=fc25\\\|fc26\\\|fc27\\\|fc28
 branches_index=0
+release_index=0
 
 cd `dirname $0`
 LANG=C
@@ -91,13 +92,17 @@ if [ $CHANGES -ne 0 ]; then
      | grep $releases_regexp`
    testing_update=`bodhi updates query --packages vim --status testing \
      | grep $releases_regexp`
+   # Cut the head of releases_regexp string
+   releases_regexp=${releases_regexp#*|}
+
    if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then
      fedpkg build
      if [ $? -eq 0 ]; then
        bodhi updates new --user zdohnal --type enhancement --notes "The newest \
          upstream commit" --request testing --autokarma --stable-karma 3 \
          --unstable-karma -3 vim-${UPSTREAMMAJOR}-${LASTPLFILLED}-1.\
-         ${releases[@]: $branches_index: 1}
+         ${releases[@]: $release_index: 1}
+       let "release_index+=1"
      else
        echo "Error when building package in $branch"
        exit 1
@@ -106,9 +111,6 @@ if [ $CHANGES -ne 0 ]; then
      echo "There are pending/testing updates, do not build package."
    fi
 
-   # Cut first release
-   releases_regexp=${releases_regexp#*|}
-
    for branch in "${branches[@]:(1)}";
    do
      # switch to branch
@@ -144,7 +146,8 @@ if [ $CHANGES -ne 0 ]; then
            bodhi updates new --user zdohnal --type enhancement --notes "The newest \
              upstream commit" --request testing --autokarma --stable-karma 3 \
              --unstable-karma -3 vim-${UPSTREAMMAJOR}-${LASTPLFILLED}-1.\
-             ${releases[@]: $branches_index: 1}
+             ${releases[@]: $release_index: 1}
+           let "release_index+=1"
          fi
        else
          echo "Error when building package for $branch"
@@ -152,7 +155,7 @@ if [ $CHANGES -ne 0 ]; then
        fi
      fi
 
-     # Increment index and cut first release
+     # Increment index and cut the head of releases_regexp string
      let "branches_index+=1"
      releases_regexp=${releases_regexp#*|}
    done
diff --git a/vim.spec b/vim.spec
index e7f73ad..777729f 100644
--- a/vim.spec
+++ b/vim.spec
@@ -24,7 +24,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@@ -774,6 +774,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Tue Sep 19 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1123-2
+- vim-update.sh - fixing bug with submiting update (update got submitted for previous version)
+
 * Mon Sep 18 2017 Karsten Hopp <karsten@redhat.com> 8.0.1123-1
 - patchlevel 1123