From 5059993ee123728d446679e8ad2aa427079aa9c8 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Aug 09 2017 10:25:32 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index ae9a1a8..9da03a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,4 @@
 /vim-8.0-844.tar.bz2
 /vim-8.0-885.tar.bz2
 /vim-8.0-891.tar.bz2
+/vim-8.0-893.tar.bz2
diff --git a/README.patches b/README.patches
index 95146fa..1c6c6a9 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,21 @@
+commit 82b9ca05f40a627355e7c3bcf49b1f19ffbdaf87
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Aug 8 23:06:46 2017 +0200
+
+    patch 8.0.0893: cannot get the scroll count of a terminal window
+    
+    Problem:    Cannot get the scroll count of a terminal window.
+    Solution:   Add term_getscrolled().
+
+commit 292d5699356dc4a22fcfbab92f0a558e90f7cfba
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Aug 8 21:52:22 2017 +0200
+
+    patch 8.0.0892: when opening a terminal the pty size doesn't always match
+    
+    Problem:    When opening a terminal the pty size doesn't always match.
+    Solution:   Update the pty size after opening the terminal. (Ken Takata)
+
 commit 7fadbf83256bb823b994a52758127594dd82ab39
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Mon Aug 7 22:08:05 2017 +0200
diff --git a/sources b/sources
index 8e4343f..5c7b5f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-891.tar.bz2) = b961ba041fa0bc5d17a170f4cda73b0283da2ba65810ad0dd602b739c0bc2b02045431d90af1c6c7861fe8e5d61857231ddc131cba9e88927f388ae5e08ecf18
+SHA512 (vim-8.0-893.tar.bz2) = 0ce2db5d9d3abcc149a3efe9ab900f54b081e773368254d2244f81686493787cd859bce0f1c212b9729c6d727d17c716f6a8951b46d481efe02d11d1a6a7b430
diff --git a/vim-update.sh b/vim-update.sh
index 80fc13d..041e05a 100755
--- a/vim-update.sh
+++ b/vim-update.sh
@@ -13,7 +13,13 @@ if [ "x$1" == "x--force" ]; then
 fi
 
 DATE=`date +"%a %b %d %Y"`
-fedpkg switch-branch master
+fedpkg switch-branch $1
+
+if [ $? -ne 0 ]; then
+  echo "Error with switching branch"
+  exit 1
+fi
+
 MAJORVERSION=`grep "define baseversion" vim.spec | cut -d ' ' -f 3`
 ORIGPL=`grep "define patchlevel" vim.spec | cut -d ' ' -f 3 | sed -e "s/^0*//g"`
 ORIGPLFILLED=`printf "%03d" $ORIGPL`
@@ -61,12 +67,13 @@ if [ $CHANGES -ne 0 ]; then
    $debug fedpkg new-sources vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.tar.bz2
    $debug git add vim.spec README.patches
    $debug git commit -m "- patchlevel $LASTPL" 
-   $debug git push
-   if [ $? -eq 0 ]; then
-      $debug rm -f $HOME/.koji/config
-      $debug fedpkg build
-      $debug ln -sf ppc-config $HOME/.koji/config
-   else
-      echo "GIT push failed"
-   fi
+   $debug fedpkg mockbuild
+   #$debug git push
+   #if [ $? -eq 0 ]; then
+   #   $debug rm -f $HOME/.koji/config
+   #   $debug fedpkg build
+   #   $debug ln -sf ppc-config $HOME/.koji/config
+   #else
+   #   echo "GIT push failed"
+   #fi
 fi
diff --git a/vim.spec b/vim.spec
index 676c177..c5e86b0 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 891
+%define patchlevel 893
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,12 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Wed Aug 09 2017 Karsten Hopp <karsten@redhat.com> 8.0.893-1
+- patchlevel 893
+
+* Wed Aug 09 2017 Zdenek Dohnal <zdohnal@redhat.com> 8.0.891-2
+- editing vim-update.sh - now it takes branch name as argument for switching and run mockbuild
+
 * Tue Aug 08 2017 Karsten Hopp <karsten@redhat.com> 8.0.891-1
 - patchlevel 891