Accepting request 800596 from home:polslinux:branches:editors

- Update to version 8.2.0701 (no changelog)
- Rebase no-common.patch
- Rebase disable-unreliable-tests.patch

OBS-URL: https://build.opensuse.org/request/show/800596
OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=600

disable-unreliable-tests.patch

@@ -1,8 +1,7 @@
-Index: vim-8.2.0348/src/testdir/Make_all.mak
-===================================================================
---- vim-8.2.0348.orig/src/testdir/Make_all.mak
-+++ vim-8.2.0348/src/testdir/Make_all.mak
-@@ -54,7 +54,6 @@ NEW_TESTS = \
+diff -ru a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
+--- a/src/testdir/Make_all.mak	2020-05-04 23:24:44.000000000 +0200
++++ b/src/testdir/Make_all.mak	2020-05-06 09:31:18.902269152 +0200
+@@ -67,7 +67,6 @@
  	test_autoload \
  	test_backspace_opt \
  	test_backup \
@@ -10,7 +9,7 @@ Index: vim-8.2.0348/src/testdir/Make_all.mak
  	test_balloon_gui \
  	test_behave \
  	test_blob \
-@@ -185,7 +184,6 @@ NEW_TESTS = \
+@@ -200,7 +199,6 @@
  	test_netbeans \
  	test_normal \
  	test_number \
@@ -18,7 +17,7 @@ Index: vim-8.2.0348/src/testdir/Make_all.mak
  	test_packadd \
  	test_partial \
  	test_paste \
-@@ -301,7 +299,6 @@ NEW_TESTS_RES = \
+@@ -316,7 +314,6 @@
  	test_autocmd.res \
  	test_autoload.res \
  	test_backspace_opt.res \
@@ -26,20 +25,19 @@ Index: vim-8.2.0348/src/testdir/Make_all.mak
  	test_balloon_gui.res \
  	test_blob.res \
  	test_blockedit.res \
-Index: vim-8.2.0348/src/testdir/Makefile
-===================================================================
---- vim-8.2.0348.orig/src/testdir/Makefile
-+++ vim-8.2.0348/src/testdir/Makefile
-@@ -36,8 +36,6 @@ SCRIPTS = $(SCRIPTS_ALL) \
+diff -ru a/src/testdir/Makefile b/src/testdir/Makefile
+--- a/src/testdir/Makefile	2020-05-04 23:24:44.000000000 +0200
++++ b/src/testdir/Makefile	2020-05-06 09:30:47.350206433 +0200
+@@ -36,8 +36,6 @@
  # Explicit dependencies.
  test49.out: test49.vim
  
 -test_options.res test_alot.res: opt_test.vim
 -
- SCRIPTS_BENCH = bench_re_freeze.out
+ SCRIPTS_BENCH = test_bench_regexp.res
  
  .SUFFIXES: .in .out .res .vim
-@@ -178,8 +176,5 @@ test_gui_init.res: test_gui_init.vim
+@@ -180,9 +178,6 @@
  	$(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
  	@rm vimcmd
  
@@ -48,3 +46,4 @@ Index: vim-8.2.0348/src/testdir/Makefile
 -
  test_xxd.res:
  	XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim
+ 

no-common.patch

@@ -1,12 +1,11 @@
-Index: vim-8.2.0348/src/globals.h
-===================================================================
---- vim-8.2.0348.orig/src/globals.h
-+++ vim-8.2.0348/src/globals.h
-@@ -1242,7 +1242,7 @@ extern char *Version;
+diff -ru b/src/globals.h a/src/globals.h
+--- b/src/globals.h	2020-05-05 23:32:58.000000000 +0200
++++ a/src/globals.h	2020-05-06 09:40:51.607410538 +0200
+@@ -1264,7 +1264,7 @@
  #if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC)
  extern char longVersion[];
  #else
--EXTERN char *longVersion;
+-EXTERN char *longVersion INIT(= NULL);
 +extern char *longVersion;
  #endif
  

vim-8.2.0530.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa35e76692c4861fa983a766c6c88eb6601e21239b3aee65accf495cebcf4e21
-size 14894037

vim-8.2.0701.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09c6e80f1c05be13adf458cb9531581794b397c64d0002e82adb881e1fb7f121
+size 14939593

vim.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed May  6 07:37:25 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to version 8.2.0701 (no changelog)
+- Rebase no-common.patch
+- Rebase disable-unreliable-tests.patch
+
 -------------------------------------------------------------------
 Sat Apr 25 10:41:24 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
 

vim.spec

@@ -17,7 +17,7 @@
 
 
 %define pkg_version 8.2
-%define patchlevel 0530
+%define patchlevel 0701
 %define patchlevel_compact %{patchlevel}
 %define VIM_SUBDIR vim82
 %define site_runtimepath %{_datadir}/vim/site