- up to 8.2.0011

diff --git a/vim-home_etc.patch b/vim-home_etc.patch
index 25db1d6750be79cf9db027f09a657ddb2af4f70b..d8ce61297304bf458083ebbe96fa9e46e5a2baeb 100644 (file)
--- a/vim-home_etc.patch
+++ b/vim-home_etc.patch
@@ -59,12 +59,12 @@ diff -Nru vim62.orig/src/misc1.c vim62/src/misc1.c
  #  endif
  # endif
  # if !defined(VIMINFO_FILE2) && defined(OS2)
-@@ -362,7 +362,7 @@ typedef struct dsc$descriptor   DESC;
+@@ -358,7 +358,7 @@ typedef struct dsc$descriptor   DESC;
  # ifdef VMS
  #  define DFLT_VDIR    "sys$login:vimfiles/view"
  # else
--#  define DFLT_VDIR    "$HOME/.vim/view"       /* default for 'viewdir' */
-+#  define DFLT_VDIR    "$HOME_ETC/.vim/view"       /* default for 'viewdir' */
+-#  define DFLT_VDIR    "$HOME/.vim/view"       // default for 'viewdir'
++#  define DFLT_VDIR    "$HOME_ETC/.vim/view"       // default for 'viewdir'
  # endif
  #endif
  

diff --git a/vim-localedir.patch b/vim-localedir.patch
index 46f3732ae424c4a5bcade349a4eb4af1f1877411..18b4a4cbf1e46140a448ff46a1e5f5ce06c3448d 100644 (file)
--- a/vim-localedir.patch
+++ b/vim-localedir.patch
@@ -1,18 +1,11 @@
 --- vim72/src/main.c~  2009-04-15 01:00:47.000000000 +0300
 +++ vim72/src/main.c   2009-04-15 01:11:33.555899981 +0300
-@@ -1573,24 +1573,10 @@ init_locale(void)
- 
- # ifdef FEAT_GETTEXT
-     {
--      int     mustfree = FALSE;
--      char_u  *p;
--
- #  ifdef DYNAMIC_GETTEXT
-       /* Initialize the gettext library */
+@@ -1741,17 +1741,6 @@ init_locale(void)
+       // Initialize the gettext library
        dyn_libintl_init();
  #  endif
--      /* expand_env() doesn't work yet, because g_chartab[] is not
--       * initialized yet, call vim_getenv() directly */
+-      // expand_env() doesn't work yet, because g_chartab[] is not
+-      // initialized yet, call vim_getenv() directly
 -      p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
 -      if (p != NULL && *p != NUL)
 -      {

diff --git a/vim.spec b/vim.spec
index b2bdfd640d243de0a2615063c93219cc0536744a..f1ac6e8d4250bbecbd3024bef027ac00789d6df4 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -29,8 +29,8 @@
 # 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.1.2352
-%define                rel             2
+%define                ver             8.2.0011
+%define                rel             1
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
 Summary(es.UTF-8):     Editor visual incrementado
@@ -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: 92ca078a1472b7d7875a4eba35ee4a50
+# Source0-md5: 9ff52728337b4053fcf11f2a65a19296
 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