Sync changes to SLFO-1.2 branch

spec.skeleton

@@ -1,7 +1,7 @@
 #
 # spec file for package specRPM_CREATION_NAME
 #
-# Copyright (c) specCURRENT_YEAR SUSE LLC and contributors
+# Copyright (c) specCURRENT_YEAR SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

suse.vimrc

@@ -5,11 +5,6 @@
 " version: 2021/02/22
 " commented lines start with `"'
 
-" get easier to use and more user friendly vim defaults
-" CAUTION: This option breaks some vi compatibility. 
-"          Switch it off if you prefer real vi compatibility
-set nocompatible
-
 " enable syntax highlighting
 if &t_Co > 2 || has("gui_running")
     syntax on
@@ -36,6 +31,11 @@ set showmode
 " Required to be able to use keypad keys and map missed escape sequences
 set esckeys
 
+" get easier to use and more user friendly vim defaults
+" CAUTION: This option breaks some vi compatibility. 
+"          Switch it off if you prefer real vi compatibility
+set nocompatible
+
 " allow backspacing over everything in insert mode 
 set backspace=indent,eol,start
 

vim-7.3-filetype_changes.patch

@@ -1,10 +1,10 @@
-Index: vim-9.1.1857/runtime/filetype.vim
+Index: vim-8.2.2411/runtime/filetype.vim
 ===================================================================
---- vim-9.1.1857.orig/runtime/filetype.vim
-+++ vim-9.1.1857/runtime/filetype.vim
-@@ -221,6 +221,9 @@ endif
- " Set g_filetype_h to set a different filetype
- au BufNewFile,BufRead *.h			call dist#ft#FTheader()
+--- vim-8.2.2411.orig/runtime/filetype.vim
++++ vim-8.2.2411/runtime/filetype.vim
+@@ -320,6 +320,9 @@ au BufNewFile,BufRead *.css			setf css
+ " Century Term Command Scripts (*.cmd too)
+ au BufNewFile,BufRead *.con			setf cterm
  
 +" SuSE .changes file
 +au BufNewFile,BufRead *.changes			setf changes
@@ -12,10 +12,10 @@ Index: vim-9.1.1857/runtime/filetype.vim
  " Changelog
  au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch,*/debian/changelog
  					\	setf debchangelog
-Index: vim-9.1.1857/runtime/syntax/changes.vim
+Index: vim-8.2.2411/runtime/syntax/changes.vim
 ===================================================================
 --- /dev/null
-+++ vim-9.1.1857/runtime/syntax/changes.vim
++++ vim-8.2.2411/runtime/syntax/changes.vim
 @@ -0,0 +1,41 @@
 +" Vim syntax file
 +" Filename:     changes.vim

vim-7.3-filetype_ftl.patch

@@ -1,19 +1,22 @@
-Index: vim-9.1.1856/runtime/filetype.vim
+Index: vim-9.1.0330/runtime/filetype.vim
 ===================================================================
---- vim-9.1.1856.orig/runtime/filetype.vim
-+++ vim-9.1.1856/runtime/filetype.vim
-@@ -1638,3 +1638,7 @@ let &cpo = s:cpo_save
- unlet s:cpo_save
+--- vim-9.1.0330.orig/runtime/filetype.vim
++++ vim-9.1.0330/runtime/filetype.vim
+@@ -2313,6 +2313,10 @@ au BufNewFile,BufRead *.stp			setf stp
+ " Standard ML
+ au BufNewFile,BufRead *.sml			setf sml
  
- " vim: ts=8
 +" FreeMarker templates
 +au BufNewFile,BufRead *.ftl     setf ftl
 +
 +
-Index: vim-9.1.1856/runtime/syntax/ftl.vim
+ " Sratus VOS command macro
+ au BufNewFile,BufRead *.cm			setf voscm
+ 
+Index: vim-9.1.0330/runtime/syntax/ftl.vim
 ===================================================================
 --- /dev/null
-+++ vim-9.1.1856/runtime/syntax/ftl.vim
++++ vim-9.1.0330/runtime/syntax/ftl.vim
 @@ -0,0 +1,36 @@
 +" Vim syntax file
 +" Language:	FreeMarker Template Language (FTL)

vim-7.3-filetype_spec.patch

@@ -1,12 +1,26 @@
-Index: vim-9.1.1918/runtime/autoload/dist/ft.vim
+Index: vim-9.1.0151/runtime/filetype.vim
 ===================================================================
---- vim-9.1.1918.orig/runtime/autoload/dist/ft.vim
-+++ vim-9.1.1918/runtime/autoload/dist/ft.vim
-@@ -2673,6 +2673,7 @@ const ft_from_ext = {
-   "sparql": "sparql",
-   # Spec (Linux RPM)
-   "spec": "spec",
-+  "spec.in": "spec",
-   # Speedup (AspenTech plant simulator)
-   "speedup": "spup",
-   "spdata": "spup",
+--- vim-9.1.0151.orig/runtime/filetype.vim
++++ vim-9.1.0151/runtime/filetype.vim
+@@ -2122,7 +2122,7 @@ au BufRead,BufNewFile *.sol			setf solid
+ au BufNewFile,BufRead *.rq,*.sparql		setf sparql
+ 
+ " Spec (Linux RPM)
+-au BufNewFile,BufRead *.spec			setf spec
++au BufNewFile,BufRead *.spec,*.spec.in		setf spec
+ 
+ " Speedup (AspenTech plant simulator)
+ au BufNewFile,BufRead *.speedup,*.spdata,*.spd	setf spup
+Index: vim-9.1.0151/runtime/syntax/spec.vim
+===================================================================
+--- vim-9.1.0151.orig/runtime/syntax/spec.vim
++++ vim-9.1.0151/runtime/syntax/spec.vim
+@@ -102,7 +102,7 @@ syn case ignore
+ "%% PreAmble Section %%
+ "Copyright and Serial were deprecated by License and Epoch
+ syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+-syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
++syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|Freshens\|EssentialFor\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+ 
+ "%% Description Section %%
+ syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment

vim-7.3-gvimrc_fontset.patch

@@ -1,8 +1,8 @@
-Index: vim-9.1.1706/runtime/gvimrc_example.vim
+Index: vim-8.2.2411/runtime/gvimrc_example.vim
 ===================================================================
---- vim-9.1.1706.orig/runtime/gvimrc_example.vim
-+++ vim-9.1.1706/runtime/gvimrc_example.vim
-@@ -16,9 +16,6 @@
+--- vim-8.2.2411.orig/runtime/gvimrc_example.vim
++++ vim-8.2.2411/runtime/gvimrc_example.vim
+@@ -15,9 +15,6 @@
  " Make external commands work through a pipe instead of a pseudo-tty
  "set noguipty
  
@@ -12,7 +12,7 @@ Index: vim-9.1.1706/runtime/gvimrc_example.vim
  set ch=2		" Make command line two lines high
  
  set mousehide		" Hide the mouse when typing text
-@@ -54,3 +51,29 @@ if version >= 500
+@@ -53,3 +50,29 @@ if version >= 500
    highlight Special gui=NONE guibg=grey95
  
  endif

vim-7.3-mktemp_tutor.patch

@@ -1,8 +1,8 @@
-Index: vim-9.1.1706/src/vimtutor
+Index: vim-9.1.0908/src/vimtutor
 ===================================================================
---- vim-9.1.1706.orig/src/vimtutor
-+++ vim-9.1.1706/src/vimtutor
-@@ -159,9 +159,8 @@ done
+--- vim-9.1.0908.orig/src/vimtutor
++++ vim-9.1.0908/src/vimtutor
+@@ -158,9 +158,8 @@ done
  
  
  # We need a temp file for the copy.  First try using a standard command.

vim-7.3-name_vimrc.patch

@@ -1,8 +1,8 @@
-Index: vim-9.1.1706/src/feature.h
+Index: vim-8.2.2411/src/feature.h
 ===================================================================
---- vim-9.1.1706.orig/src/feature.h
-+++ vim-9.1.1706/src/feature.h
-@@ -704,11 +704,12 @@
+--- vim-8.2.2411.orig/src/feature.h
++++ vim-8.2.2411/src/feature.h
+@@ -813,11 +813,12 @@
   * SYS_VIMRC_FILE	Name of the system-wide .vimrc file.
   */
  // #define SYS_VIMRC_FILE	"/etc/vimrc"

vim-7.3-sh_is_bash.patch

@@ -1,9 +1,9 @@
-Index: vim-9.1.1856/runtime/syntax/sh.vim
+Index: vim-9.1.1406/runtime/syntax/sh.vim
 ===================================================================
---- vim-9.1.1856.orig/runtime/syntax/sh.vim
-+++ vim-9.1.1856/runtime/syntax/sh.vim
-@@ -147,6 +147,13 @@ if exists("b:is_kornshell") || exists("b
-     endif
+--- vim-9.1.1406.orig/runtime/syntax/sh.vim
++++ vim-9.1.1406/runtime/syntax/sh.vim
+@@ -142,6 +142,13 @@ if exists("b:is_kornshell") || exists("b
+  endif
  endif
  
 +" Neither is_kornshell nor is_bash was explicitly set, and

vim-7.4-disable_lang_no.patch

@@ -1,8 +1,8 @@
-Index: vim-9.1.1706/src/po/Make_all.mak
+Index: vim-8.2.2411/src/po/Make_all.mak
 ===================================================================
---- vim-9.1.1706.orig/src/po/Make_all.mak
-+++ vim-9.1.1706/src/po/Make_all.mak
-@@ -26,7 +26,6 @@ LANGUAGES = \
+--- vim-8.2.2411.orig/src/po/Make_all.mak
++++ vim-8.2.2411/src/po/Make_all.mak
+@@ -24,7 +24,6 @@ LANGUAGES = \
  		lv \
  		nb \
  		nl \
@@ -10,7 +10,7 @@ Index: vim-9.1.1706/src/po/Make_all.mak
  		pl \
  		pl.UTF-8 \
  		pl.cp1250 \
-@@ -114,7 +113,6 @@ MOFILES = \
+@@ -109,7 +108,6 @@ MOFILES = \
  		lv.mo \
  		nb.mo \
  		nl.mo \
@@ -18,7 +18,7 @@ Index: vim-9.1.1706/src/po/Make_all.mak
  		pl.mo \
  		pt_BR.mo \
  		ru.mo \
-@@ -167,7 +165,6 @@ CHECKFILES = \
+@@ -159,7 +157,6 @@ CHECKFILES = \
  		lv.ck \
  		nb.ck \
  		nl.ck \

vim-7.4-filetype_apparmor.patch

@@ -1,15 +1,15 @@
-Index: vim-9.1.1918/runtime/filetype.vim
+Index: vim-8.2.2411/runtime/filetype.vim
 ===================================================================
---- vim-9.1.1918.orig/runtime/filetype.vim
-+++ vim-9.1.1918/runtime/filetype.vim
-@@ -124,6 +124,10 @@ au BufNewFile,BufRead *.demo,*.dm{1,2,3,
- " *.[sS], *.[aA] usually Assembly - GNU
- au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call dist#ft#FTasm()
+--- vim-8.2.2411.orig/runtime/filetype.vim
++++ vim-8.2.2411/runtime/filetype.vim
+@@ -104,6 +104,10 @@ au BufNewFile,BufRead *.ino,*.pde		setf
+ au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf		setf apache
+ au BufNewFile,BufRead */etc/apache2/sites-*/*.com		setf apache
  
 +" AppArmor
 +au BufNewFile,BufRead */etc/apparmor.d/*       setf apparmor
 +au BufNewFile,BufRead */etc/apparmor/profiles/*        setf apparmor
 +
- " BASIC or Visual Basic
- au BufNewFile,BufRead *.bas			call dist#ft#FTbas()
- au BufNewFile,BufRead *.bi,*.bm			call dist#ft#FTbas()
+ " XA65 MOS6510 cross assembler
+ au BufNewFile,BufRead *.a65			setf a65
+ 

vim-7.4-filetype_mine.patch

@@ -1,8 +1,8 @@
-Index: vim-9.1.1706/runtime/filetype.vim
+Index: vim-8.2.2411/runtime/filetype.vim
 ===================================================================
---- vim-9.1.1706.orig/runtime/filetype.vim
-+++ vim-9.1.1706/runtime/filetype.vim
-@@ -18,7 +18,7 @@ augroup filetypedetect
+--- vim-8.2.2411.orig/runtime/filetype.vim
++++ vim-8.2.2411/runtime/filetype.vim
+@@ -17,7 +17,7 @@ augroup filetypedetect
  
  " Ignored extensions
  if exists("*fnameescape")

vim-8.0.1568-defaults.patch

@@ -1,8 +1,8 @@
-Index: vim-9.1.1706/runtime/defaults.vim
+Index: vim-8.2.2411/runtime/defaults.vim
 ===================================================================
---- vim-9.1.1706.orig/runtime/defaults.vim
-+++ vim-9.1.1706/runtime/defaults.vim
-@@ -73,13 +73,15 @@ inoremap <C-U> <C-G>u<C-U>
+--- vim-8.2.2411.orig/runtime/defaults.vim
++++ vim-8.2.2411/runtime/defaults.vim
+@@ -77,13 +77,15 @@ inoremap <C-U> <C-G>u<C-U>
  " can position the cursor, Visually select and scroll with the mouse.
  " Only xterm can grab the mouse events when using the shift key, for other
  " terminals use ":", select text and press Esc.

vim-8.2.2411-globalvimrc.patch

@@ -1,8 +1,8 @@
-Index: vim-9.1.1706/src/main.c
+Index: vim-9.1.0530/src/main.c
 ===================================================================
---- vim-9.1.1706.orig/src/main.c
-+++ vim-9.1.1706/src/main.c
-@@ -3364,7 +3364,10 @@ source_startup_scripts(mparm_T *parmp)
+--- vim-9.1.0530.orig/src/main.c
++++ vim-9.1.0530/src/main.c
+@@ -3251,7 +3251,10 @@ source_startup_scripts(mparm_T *parmp)
  	 * Get system wide defaults, if the file name is defined.
  	 */
  #ifdef SYS_VIMRC_FILE

vim-9.1.1134-revert-putty-terminal-colors.patch

@@ -12,10 +12,10 @@ This reverts commit 2abec431e1ab5f4f6e21c2bb490241732622a8c5.
  src/testdir/test_cmdline.vim |  2 --
  4 files changed, 7 insertions(+), 20 deletions(-)
 
-Index: vim-9.1.1706/runtime/defaults.vim
+Index: vim-9.1.1176/runtime/defaults.vim
 ===================================================================
---- vim-9.1.1706.orig/runtime/defaults.vim
-+++ vim-9.1.1706/runtime/defaults.vim
+--- vim-9.1.1176.orig/runtime/defaults.vim
++++ vim-9.1.1176/runtime/defaults.vim
 @@ -112,11 +112,6 @@ if 1
        \ |   execute "normal! g`\""
        \ | endif
@@ -28,11 +28,11 @@ Index: vim-9.1.1706/runtime/defaults.vim
    augroup END
  
    " Quite a few people accidentally type "q:" instead of ":q" and get confused
-Index: vim-9.1.1706/runtime/doc/autocmd.txt
+Index: vim-9.1.1176/runtime/doc/autocmd.txt
 ===================================================================
---- vim-9.1.1706.orig/runtime/doc/autocmd.txt
-+++ vim-9.1.1706/runtime/doc/autocmd.txt
-@@ -1291,19 +1291,10 @@ TerminalWinOpen			Just after a terminal
+--- vim-9.1.1176.orig/runtime/doc/autocmd.txt
++++ vim-9.1.1176/runtime/doc/autocmd.txt
+@@ -1260,19 +1260,10 @@ TerminalWinOpen			Just after a terminal
  TermResponse			After the response to |t_RV| is received from
  				the terminal.  The value of |v:termresponse|
  				can be used to do things depending on the
@@ -55,12 +55,12 @@ Index: vim-9.1.1706/runtime/doc/autocmd.txt
 +				anything else that takes time is involved.
  							*TermResponseAll*
  TermResponseAll			After the response to |t_RV|, |t_RC|, |t_RS|,
- 				|t_u7| or any OSC command are received from
-Index: vim-9.1.1706/src/testdir/test_cmdline.vim
+ 				|t_RB|, |t_RF|, or |t_u7| are received from
+Index: vim-9.1.1176/src/testdir/test_cmdline.vim
 ===================================================================
---- vim-9.1.1706.orig/src/testdir/test_cmdline.vim
-+++ vim-9.1.1706/src/testdir/test_cmdline.vim
-@@ -1899,8 +1899,6 @@ func Test_verbose_option()
+--- vim-9.1.1176.orig/src/testdir/test_cmdline.vim
++++ vim-9.1.1176/src/testdir/test_cmdline.vim
+@@ -1843,8 +1843,6 @@ func Test_verbose_option()
    CheckScreendump
  
    let lines =<< trim [SCRIPT]

vim-9.1.1966.tar.gz

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

vim.spec

@@ -2,7 +2,6 @@
 # spec file for package vim
 #
 # Copyright (c) 2025 SUSE LLC
-# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +17,7 @@
 
 
 %define pkg_version 9.1
-%define patchlevel 1966
+%define patchlevel 1406
 %define patchlevel_compact %{patchlevel}
 %define VIM_SUBDIR vim91
 %define site_runtimepath %{_datadir}/vim/site
@@ -28,6 +27,7 @@
 %else
 %bcond_with libalternatives
 %endif
+%bcond_without python2
 Name:           vim
 Version:        %{pkg_version}.%{patchlevel_compact}
 Release:        0
@@ -75,7 +75,7 @@ Patch12:        %{name}73-no-static-libpython.patch
 Patch13:        %{name}-8.0.1568-defaults.patch
 Patch14:        %{name}-8.2.2411-globalvimrc.patch
 Patch15:        %{name}-9.1.1134-revert-putty-terminal-colors.patch
-BuildRequires:  autoconf >= 2.71
+BuildRequires:  autoconf
 BuildRequires:  db-devel
 BuildRequires:  fdupes
 BuildRequires:  gettext-devel
@@ -85,7 +85,6 @@ BuildRequires:  perl
 BuildRequires:  pkgconfig
 BuildRequires:  ruby-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  wayland-utils
 BuildRequires:  pkgconfig(form)
 BuildRequires:  pkgconfig(formw)
 BuildRequires:  pkgconfig(gtk+-3.0)
@@ -103,12 +102,7 @@ BuildRequires:  pkgconfig(panelw)
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(tic)
 BuildRequires:  pkgconfig(tinfo)
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-cursor)
-BuildRequires:  pkgconfig(wayland-egl)
-BuildRequires:  pkgconfig(wayland-protocols)
 BuildRequires:  pkgconfig(xt)
-#!BuildIgnore:  glycin-loaders
 Requires:       vim-data-common = %{version}-%{release}
 Requires:       xxd = %{version}-%{release}
 Recommends:     vim-data = %{version}-%{release}
@@ -128,6 +122,9 @@ Requires:       alts
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 %endif
+%if %{with python2}
+BuildRequires:  python2-devel
+%endif
 
 %description
 Vim (Vi IMproved) is an almost compatible version of the UNIX editor
@@ -231,7 +228,9 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
 
 %build
-export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing"
+## about -std=gnu17 see github.com/vim/vim/issues/16575;
+## use -std=gnu11 here to allow build on Leap 15.6
+export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing -std=gnu11"
 export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/-D_FORTIFY_SOURCE=1}
 
 export COMMON_OPTIONS="\
@@ -263,24 +262,23 @@ export HUGE_OPTIONS="\
     --enable-luainterp=dynamic \
     --enable-perlinterp=yes \
     --enable-python3interp=dynamic \
-    --enable-rubyinterp=dynamic"
+    --enable-rubyinterp=dynamic
+    --enable-pythoninterp=%{?with_python2:yes}%{!?with_python2:no}"
 
 export GUI_OPTIONS="\
     --disable-icon-cache-update \
     --enable-xim \
     --enable-fontset \
-    --enable-gui=gtk3 \
-    --enable-wayland"
+    --enable-gui=gtk3"
 
 export NOGUI_OPTIONS="\
     --disable-gui \
     --disable-gpm \
     --with-x=no \
-    --without-wayland \
     "
 
 pushd src
-make autoconf
+autoconf
 popd
 
 # build smaller vim

vim73-no-static-libpython.patch

@@ -1,8 +1,8 @@
-Index: vim-9.1.1706/src/configure.ac
+Index: vim-8.2.2411/src/configure.ac
 ===================================================================
---- vim-9.1.1706.orig/src/configure.ac
-+++ vim-9.1.1706/src/configure.ac
-@@ -1416,7 +1416,7 @@ eof
+--- vim-8.2.2411.orig/src/configure.ac
++++ vim-8.2.2411/src/configure.ac
+@@ -1289,7 +1289,7 @@ eof
  		  vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
  	      fi
  	    else