Merge branch 'f25' into f26

vim-update.sh

@@ -56,10 +56,8 @@ make unixall
 mv dist/vim-${UPSTREAMMAJOR}.tar.bz2 dist/vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.tar.bz2
 # We don't include the full upstream changelog in the rpm changelog, just ship a file with
 # the changes:
-git log > dist/README.patches
 popd
 
-cp -f vim-upstream/dist/README.patches README.patches
 cp -f vim-upstream/dist/vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.tar.bz2 .
 #wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/master/ftplugin/spec.vim -O ftplugin-spec.vim
 #wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/master/syntax/spec.vim -O syntax-spec.vim
@@ -72,7 +70,7 @@ if [ $CHANGES -ne 0 ]; then
    $debug sed -i -e "s/define patchlevel $ORIGPLFILLED/define patchlevel $LASTPLFILLED/" $SPEC
    $debug sed -i -e "/\%changelog/a$CHLOG.$LASTPLFILLED-1\n- patchlevel $LASTPLFILLED\n" $SPEC
    $debug fedpkg new-sources vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.tar.bz2
-   $debug git add vim.spec README.patches
+   $debug git add vim.spec
    $debug git commit -m "- patchlevel $LASTPL" 
    # mockbuild
    $debug fedpkg mockbuild

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
@@ -32,7 +32,6 @@ Source1: vim.sh
 Source2: vim.csh
 Source4: virc
 Source5: vimrc
-Source6: ftp://ftp.vim.org/pub/vim/patches/README.patches
 Source7: gvim16.png
 Source8: gvim32.png
 Source9: gvim48.png
@@ -231,7 +230,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3017 -p1
 
 %build
-cp -f %{SOURCE6} .
 cd src
 autoconf
 
@@ -774,6 +772,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Tue Sep 26 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1144-2
+- removing README.patches
+
 * Mon Sep 25 2017 Karsten Hopp <karsten@redhat.com> 8.0.1144-1
 - patchlevel 1144