From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Thu, 3 May 2018 09:08:03 +0000 (+0200)
Subject: - up to 8.0.1788
X-Git-Tag: auto/th/vim-8.0.1788-1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=8c2513eff988c6de9b71a67d14d73c6677045a2f;p=packages%2Fvim.git

- up to 8.0.1788
---

diff --git a/vim-home_etc.patch b/vim-home_etc.patch
index cf2eb79..20c40b1 100644
--- a/vim-home_etc.patch
+++ b/vim-home_etc.patch
@@ -69,16 +69,16 @@ diff -Nru vim62.orig/src/misc1.c vim62/src/misc1.c
  # endif
  #endif
  
-@@ -387,9 +387,9 @@
- # define DFLT_RUNTIMEPATH      "sys$login:vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,sys$login:vimfiles/after"
+@@ -370,10 +370,10 @@ typedef struct dsc$descriptor   DESC;
  #else
  # ifdef RUNTIME_GLOBAL
--#  define DFLT_RUNTIMEPATH	"~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"
-+#  define DFLT_RUNTIMEPATH	"$HOME_ETC/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,$HOME_ETC/.vim/after"
+ #  define DFLT_RUNTIMEPATH	"~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"
+-#  define CLEAN_RUNTIMEPATH	RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after"
++#  define CLEAN_RUNTIMEPATH	"$HOME_ETC/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,$HOME_ETC/.vim/after"
  # else
--#  define DFLT_RUNTIMEPATH	"~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
-+#  define DFLT_RUNTIMEPATH	"$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME_ETC/.vim/after"
+ #  define DFLT_RUNTIMEPATH	"~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
+-#  define CLEAN_RUNTIMEPATH	"$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
++#  define CLEAN_RUNTIMEPATH	"$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME_ETC/.vim/after"
  # endif
  #endif
  
- #ifndef VMS
diff --git a/vim.spec b/vim.spec
index ab4d63a..95dac43 100644
--- a/vim.spec
+++ b/vim.spec
@@ -29,7 +29,7 @@
 # wget ftp://ftp.vim.org/pub/editors/vim/patches/8.0/MD5SUMS -O - | tail -n1 | awk '{print $2}'
 # VCS Commits: https://github.com/vim/vim/commits/master
 
-%define		ver		8.0.1473
+%define		ver		8.0.1788
 %define		rel		1
 Summary:	Vi IMproved - a Vi clone
 Summary(de.UTF-8):	VIsual editor iMproved
@@ -50,7 +50,7 @@ License:	Charityware
 Group:		Applications/Editors/Vim
 #Source0:	ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
 Source0:	https://github.com/vim/vim/archive/v%{ver}.tar.gz
-# Source0-md5:	7b6d0450cbc11727829cdb73e5068c51
+# Source0-md5:	a206af0538248328286e1a8b3a186838
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	bc4d1e115ca506ad7751b9bd2b773a7f
 Source2:	http://skawina.eu.org/mikolaj/usr_doc_pl.zip
@@ -1301,6 +1301,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/vim/colors
 %doc %{_datadir}/vim/colors/README.txt
 %{_datadir}/vim/colors/*.vim
+%dir %{_datadir}/vim/colors/tools
+%{_datadir}/vim/colors/tools/check_colors.vim
 
 %dir %{_datadir}/vim/lang
 %doc %{_datadir}/vim/lang/README*