From b3e716014dbaf468d21fda130518138a03a61693 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Feb 20 2019 12:02:23 +0000
Subject: Merge branch 'f29' into f28


---

diff --git a/.gitignore b/.gitignore
index f3d4f9f..7af3ef7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -246,3 +246,4 @@
 /vim-8.1-880.tar.bz2
 /vim-8.1-897.tar.bz2
 /vim-8.1-918.tar.bz2
+/vim-8.1-956.tar.bz2
diff --git a/sources b/sources
index 4572422..e1bb39f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.1-918.tar.bz2) = 58fc2a3e8200721b93b10d3e3bc65cfdc4dcbcb0fe836c42c57058706d279ba638abf2a501dc12988738e2eff3348363f52596c1e3ef3727b8360895aca7f550
+SHA512 (vim-8.1-956.tar.bz2) = a32efd344295e1d68559693d9f53710bc77a2d8a6f19dc969cda588f7924d854f91dc4e4c35332e954c51daa2563a46ad3081a7a236bdf03a8b2b6a777a01d77
diff --git a/vim-7.4-licensemacro-1151450.patch b/vim-7.4-licensemacro-1151450.patch
deleted file mode 100644
index 3a6e0a7..0000000
--- a/vim-7.4-licensemacro-1151450.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up vim74_new/runtime/syntax/spec.vim.1151450 vim74_new/runtime/syntax/spec.vim
---- vim74_new/runtime/syntax/spec.vim.1151450	2014-10-13 10:45:07.570944538 +0200
-+++ vim74_new/runtime/syntax/spec.vim	2014-10-13 10:44:09.046945965 +0200
-@@ -88,9 +88,9 @@ syn region specSectionMacroBracketArea o
- "%% Files Section %%
- "TODO %config valid parameters: missingok\|noreplace
- "TODO %verify valid parameters: \(not\)\= \(md5\|atime\|...\)
--syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
-+syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|license\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
- "tip: remember to include new itens in specFilesArea above
--syn match  specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>'
-+syn match  specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|license\)\>'
- 
- "valid options for certain section headers
- syn match specDescriptionOpts contained '\s-[ln]\s*\a'ms=s+1,me=e-1
diff --git a/vim-update.sh b/vim-update.sh
index c68b267..94bfd04 100755
--- a/vim-update.sh
+++ b/vim-update.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 debug=""
 #debug="echo "
-branches=( "master" "f29" "f28" )
-releases=( "fc30" "fc29" "fc28" )
-regexps=( "fc30" "\|fc29" "\|fc28" )
-bodhi_enabled=( "0" "1" "1" )
-branches_count=3
+branches=( "master" "f30" "f29" "f28" )
+releases=( "fc31" "fc30" "fc29" "fc28" )
+regexps=( "fc31" "\|fc30" "\|fc29" "\|fc28" )
+bodhi_enabled=( "0" "0" "1" "1" )
+branches_count=4
 #releases_regexp=fc28\\\|fc27\\\|fc28
 
 branches_index=0
diff --git a/vim.spec b/vim.spec
index 74b8f52..38d13e9 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 918
+%define patchlevel 956
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -57,7 +57,6 @@ Patch3008: vim-7.4-syncolor.patch
 Patch3009: vim-7.0-specedit.patch
 Patch3010: vim-7.3-manpage-typo-668894-675480.patch
 Patch3011: vim-manpagefixes-948566.patch
-Patch3012: vim-7.4-licensemacro-1151450.patch
 Patch3013: vim-7.4-globalsyntax.patch
 Patch3014: vim-7.4-releasestring-1318991.patch
 Patch3016: vim-8.0-copy-paste.patch
@@ -246,7 +245,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 #patch3009 -p1
 %patch3010 -p1
 %patch3011 -p1
-%patch3012 -p1
 %patch3013 -p1
 %patch3014 -p1
 %patch3016 -p1
@@ -796,6 +794,12 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Wed Feb 20 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.956-1
+- patchlevel 956
+
+* Wed Feb 20 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.918-2
+- we have Fedora 30 branch now, enable updates for it in vim-update.sh
+
 * Thu Feb 14 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.918-1
 - patchlevel 918