From 69f0ed443935a28ae1dc509e07f75b9ffbe86b7e Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 19 Apr 2021 12:35:10 +0200 Subject: [PATCH 01/13] Load installed vim plugins resolves: #1909495 --- neovim.spec | 9 ++++++++- sysinit.vim | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/neovim.spec b/neovim.spec index c71d87e..5b723d3 100644 --- a/neovim.spec +++ b/neovim.spec @@ -15,7 +15,7 @@ Name: neovim Version: 0.4.4 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Summary: Vim-fork focused on extensibility and agility @@ -94,6 +94,9 @@ parts of Vim, without compromise, and more. %endif %build +# set vars to make build reproducible; see config/CMakeLists.txt +HOSTNAME=koji +USERNAME=koji %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DPREFER_LUA=%{?with_luajit:OFF}%{!?with_luajit:ON} \ -DLUA_PRG=%{_bindir}/%{?with_luajit:luajit}%{!?with_luajit:lua} \ @@ -1593,6 +1596,10 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Mon Apr 19 2021 Andreas Schneider - 0.4.4-5 +- resolves: #1909495 - Load installed vim plugins +- Make build reproducible + * Tue Jan 26 2021 Fedora Release Engineering - 0.4.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sysinit.vim b/sysinit.vim index 21a501d..bd151fc 100644 --- a/sysinit.vim +++ b/sysinit.vim @@ -1,6 +1,9 @@ let g:python_host_prog = '/usr/bin/python2' let g:python3_host_prog = '/usr/bin/python3' +" In order for neovim to use installed plugins shared with vim +set runtimepath+=/usr/share/vim/vimfiles/ + augroup Fedora autocmd! " RPM spec file template From 3f5d24a433e9e4391962515a530f2d5d51066253 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 3 Jul 2021 05:44:08 +0200 Subject: [PATCH 02/13] Update to version 0.5.0 --- .gitignore | 1 + neovim.spec | 147 +++++++++++++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 143 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3f75b39..15efb93 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /neovim-0.4.2.tar.gz /neovim-0.4.3.tar.gz /neovim-0.4.4.tar.gz +/neovim-0.5.0.tar.gz diff --git a/neovim.spec b/neovim.spec index 5b723d3..51ac587 100644 --- a/neovim.spec +++ b/neovim.spec @@ -14,8 +14,8 @@ %global luv_min_ver 1.30.0 Name: neovim -Version: 0.4.4 -Release: 5%{?dist} +Version: 0.5.0 +Release: 0%{?dist} License: ASL 2.0 Summary: Vim-fork focused on extensibility and agility @@ -128,6 +128,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_mandir}/man1/nvim.1* %{_datadir}/applications/nvim.desktop %{_datadir}/pixmaps/nvim.png +%{_datadir}/icons/hicolor/128x128/apps/nvim.png %dir %{_datadir}/nvim %{_datadir}/nvim/sysinit.vim @@ -198,9 +199,13 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %dir %{_datadir}/nvim/runtime/autoload/dist %{_datadir}/nvim/runtime/autoload/dist/ft.vim +%dir %{_datadir}/nvim/runtime/autoload/health/ +%{_datadir}/nvim/runtime/autoload/health/treesitter.vim + %dir %{_datadir}/nvim/runtime/autoload/provider %{_datadir}/nvim/runtime/autoload/provider/clipboard.vim %{_datadir}/nvim/runtime/autoload/provider/node.vim +%{_datadir}/nvim/runtime/autoload/provider/perl.vim %{_datadir}/nvim/runtime/autoload/provider/python.vim %{_datadir}/nvim/runtime/autoload/provider/python3.vim %{_datadir}/nvim/runtime/autoload/provider/pythonx.vim @@ -252,14 +257,24 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/compiler/bdf.vim %{_datadir}/nvim/runtime/compiler/cargo.vim %{_datadir}/nvim/runtime/compiler/checkstyle.vim +%{_datadir}/nvim/runtime/compiler/cm3.vim %{_datadir}/nvim/runtime/compiler/context.vim %{_datadir}/nvim/runtime/compiler/cs.vim %{_datadir}/nvim/runtime/compiler/csslint.vim %{_datadir}/nvim/runtime/compiler/cucumber.vim +%{_datadir}/nvim/runtime/compiler/dart.vim +%{_datadir}/nvim/runtime/compiler/dart2js.vim +%{_datadir}/nvim/runtime/compiler/dart2native.vim +%{_datadir}/nvim/runtime/compiler/dartanalyser.vim +%{_datadir}/nvim/runtime/compiler/dartdevc.vim +%{_datadir}/nvim/runtime/compiler/dartdoc.vim +%{_datadir}/nvim/runtime/compiler/dartfmt.vim %{_datadir}/nvim/runtime/compiler/decada.vim %{_datadir}/nvim/runtime/compiler/dot.vim %{_datadir}/nvim/runtime/compiler/erlang.vim %{_datadir}/nvim/runtime/compiler/eruby.vim +%{_datadir}/nvim/runtime/compiler/eslint.vim +%{_datadir}/nvim/runtime/compiler/fbc.vim %{_datadir}/nvim/runtime/compiler/fortran_F.vim %{_datadir}/nvim/runtime/compiler/fortran_cv.vim %{_datadir}/nvim/runtime/compiler/fortran_elf90.vim @@ -267,9 +282,11 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/compiler/fortran_lf95.vim %{_datadir}/nvim/runtime/compiler/fpc.vim %{_datadir}/nvim/runtime/compiler/g95.vim +%{_datadir}/nvim/runtime/compiler/gawk.vim %{_datadir}/nvim/runtime/compiler/gcc.vim %{_datadir}/nvim/runtime/compiler/gfortran.vim %{_datadir}/nvim/runtime/compiler/ghc.vim +%{_datadir}/nvim/runtime/compiler/gjs.vim %{_datadir}/nvim/runtime/compiler/gnat.vim %{_datadir}/nvim/runtime/compiler/go.vim %{_datadir}/nvim/runtime/compiler/haml.vim @@ -280,7 +297,11 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/compiler/irix5_c.vim %{_datadir}/nvim/runtime/compiler/irix5_cpp.vim %{_datadir}/nvim/runtime/compiler/javac.vim +%{_datadir}/nvim/runtime/compiler/jest.vim %{_datadir}/nvim/runtime/compiler/jikes.vim +%{_datadir}/nvim/runtime/compiler/jjs.vim +%{_datadir}/nvim/runtime/compiler/jshint.vim +%{_datadir}/nvim/runtime/compiler/jsonlint.vim %{_datadir}/nvim/runtime/compiler/mcs.vim %{_datadir}/nvim/runtime/compiler/mips_c.vim %{_datadir}/nvim/runtime/compiler/mipspro_c89.vim @@ -294,24 +315,36 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/compiler/pbx.vim %{_datadir}/nvim/runtime/compiler/perl.vim %{_datadir}/nvim/runtime/compiler/php.vim +%{_datadir}/nvim/runtime/compiler/powershell.vim %{_datadir}/nvim/runtime/compiler/pylint.vim %{_datadir}/nvim/runtime/compiler/pyunit.vim %{_datadir}/nvim/runtime/compiler/rake.vim +%{_datadir}/nvim/runtime/compiler/rhino.vim %{_datadir}/nvim/runtime/compiler/rspec.vim %{_datadir}/nvim/runtime/compiler/rst.vim +%{_datadir}/nvim/runtime/compiler/rubocop.vim %{_datadir}/nvim/runtime/compiler/ruby.vim %{_datadir}/nvim/runtime/compiler/rubyunit.vim %{_datadir}/nvim/runtime/compiler/rustc.vim %{_datadir}/nvim/runtime/compiler/sass.vim %{_datadir}/nvim/runtime/compiler/se.vim +%{_datadir}/nvim/runtime/compiler/shellcheck.vim +%{_datadir}/nvim/runtime/compiler/sml.vim %{_datadir}/nvim/runtime/compiler/splint.vim %{_datadir}/nvim/runtime/compiler/stack.vim +%{_datadir}/nvim/runtime/compiler/standard.vim +%{_datadir}/nvim/runtime/compiler/stylelint.vim %{_datadir}/nvim/runtime/compiler/tcl.vim %{_datadir}/nvim/runtime/compiler/tex.vim %{_datadir}/nvim/runtime/compiler/tidy.vim +%{_datadir}/nvim/runtime/compiler/ts-node.vim +%{_datadir}/nvim/runtime/compiler/tsc.vim +%{_datadir}/nvim/runtime/compiler/typedoc.vim %{_datadir}/nvim/runtime/compiler/xbuild.vim %{_datadir}/nvim/runtime/compiler/xmllint.vim %{_datadir}/nvim/runtime/compiler/xmlwf.vim +%{_datadir}/nvim/runtime/compiler/xo.vim +%{_datadir}/nvim/runtime/compiler/zsh.vim %dir %{_datadir}/nvim/runtime/doc %{_datadir}/nvim/runtime/doc/api.txt @@ -330,6 +363,8 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/doc/filetype.txt %{_datadir}/nvim/runtime/doc/fold.txt %{_datadir}/nvim/runtime/doc/ft_ada.txt +%{_datadir}/nvim/runtime/doc/ft_ps1.txt +%{_datadir}/nvim/runtime/doc/ft_raku.txt %{_datadir}/nvim/runtime/doc/ft_rust.txt %{_datadir}/nvim/runtime/doc/ft_sql.txt %{_datadir}/nvim/runtime/doc/gui.txt @@ -338,6 +373,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/doc/helphelp.txt %{_datadir}/nvim/runtime/doc/if_cscop.txt %{_datadir}/nvim/runtime/doc/if_lua.txt +%{_datadir}/nvim/runtime/doc/if_perl.txt %{_datadir}/nvim/runtime/doc/if_pyth.txt %{_datadir}/nvim/runtime/doc/if_ruby.txt %{_datadir}/nvim/runtime/doc/indent.txt @@ -345,6 +381,9 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/doc/insert.txt %{_datadir}/nvim/runtime/doc/intro.txt %{_datadir}/nvim/runtime/doc/job_control.txt +%{_datadir}/nvim/runtime/doc/lsp-extension.txt +%{_datadir}/nvim/runtime/doc/lsp.txt +%{_datadir}/nvim/runtime/doc/lua.txt %{_datadir}/nvim/runtime/doc/makehtml.awk %{_datadir}/nvim/runtime/doc/maketags.awk %{_datadir}/nvim/runtime/doc/map.txt @@ -385,7 +424,9 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/doc/tags %{_datadir}/nvim/runtime/doc/tagsrch.txt %{_datadir}/nvim/runtime/doc/term.txt +%{_datadir}/nvim/runtime/doc/testing.txt %{_datadir}/nvim/runtime/doc/tips.txt +%{_datadir}/nvim/runtime/doc/treesitter.txt %{_datadir}/nvim/runtime/doc/uganda.txt %{_datadir}/nvim/runtime/doc/ui.txt %{_datadir}/nvim/runtime/doc/undo.txt @@ -438,10 +479,12 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/ftplugin/ant.vim %{_datadir}/nvim/runtime/ftplugin/arch.vim %{_datadir}/nvim/runtime/ftplugin/art.vim +%{_datadir}/nvim/runtime/ftplugin/asm.vim %{_datadir}/nvim/runtime/ftplugin/aspvbs.vim %{_datadir}/nvim/runtime/ftplugin/automake.vim %{_datadir}/nvim/runtime/ftplugin/awk.vim %{_datadir}/nvim/runtime/ftplugin/bash.vim +%{_datadir}/nvim/runtime/ftplugin/basic.vim %{_datadir}/nvim/runtime/ftplugin/bdf.vim %{_datadir}/nvim/runtime/ftplugin/bst.vim %{_datadir}/nvim/runtime/ftplugin/btm.vim @@ -483,6 +526,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/ftplugin/dune.vim %{_datadir}/nvim/runtime/ftplugin/eiffel.vim %{_datadir}/nvim/runtime/ftplugin/elinks.vim +%{_datadir}/nvim/runtime/ftplugin/elm.vim %{_datadir}/nvim/runtime/ftplugin/erlang.vim %{_datadir}/nvim/runtime/ftplugin/eruby.vim %{_datadir}/nvim/runtime/ftplugin/eterm.vim @@ -490,7 +534,10 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/ftplugin/fetchmail.vim %{_datadir}/nvim/runtime/ftplugin/flexwiki.vim %{_datadir}/nvim/runtime/ftplugin/fortran.vim +%{_datadir}/nvim/runtime/ftplugin/fpcmake.vim %{_datadir}/nvim/runtime/ftplugin/framescript.vim +%{_datadir}/nvim/runtime/ftplugin/freebasic.vim +%{_datadir}/nvim/runtime/ftplugin/fstab.vim %{_datadir}/nvim/runtime/ftplugin/fvwm.vim %{_datadir}/nvim/runtime/ftplugin/gdb.vim %{_datadir}/nvim/runtime/ftplugin/git.vim @@ -540,6 +587,8 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/ftplugin/logtalk.vim %{_datadir}/nvim/runtime/ftplugin/lprolog.vim %{_datadir}/nvim/runtime/ftplugin/lua.vim +%{_datadir}/nvim/runtime/ftplugin/m3build.vim +%{_datadir}/nvim/runtime/ftplugin/m3quake.vim %{_datadir}/nvim/runtime/ftplugin/m4.vim %{_datadir}/nvim/runtime/ftplugin/mail.vim %{_datadir}/nvim/runtime/ftplugin/mailaliases.vim @@ -548,10 +597,14 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/ftplugin/man.vim %{_datadir}/nvim/runtime/ftplugin/manconf.vim %{_datadir}/nvim/runtime/ftplugin/markdown.vim +%{_datadir}/nvim/runtime/ftplugin/masm.vim %{_datadir}/nvim/runtime/ftplugin/matlab.vim +%{_datadir}/nvim/runtime/ftplugin/meson.vim %{_datadir}/nvim/runtime/ftplugin/mf.vim -%{_datadir}/nvim/runtime/ftplugin/modconf.vim %{_datadir}/nvim/runtime/ftplugin/mma.vim +%{_datadir}/nvim/runtime/ftplugin/modconf.vim +%{_datadir}/nvim/runtime/ftplugin/modula2.vim +%{_datadir}/nvim/runtime/ftplugin/modula3.vim %{_datadir}/nvim/runtime/ftplugin/mp.vim %{_datadir}/nvim/runtime/ftplugin/mplayerconf.vim %{_datadir}/nvim/runtime/ftplugin/mrxvtrc.vim @@ -568,22 +621,26 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/ftplugin/pamconf.vim %{_datadir}/nvim/runtime/ftplugin/pascal.vim %{_datadir}/nvim/runtime/ftplugin/passwd.vim +%{_datadir}/nvim/runtime/ftplugin/pbtxt.vim %{_datadir}/nvim/runtime/ftplugin/pdf.vim %{_datadir}/nvim/runtime/ftplugin/perl.vim -%{_datadir}/nvim/runtime/ftplugin/perl6.vim %{_datadir}/nvim/runtime/ftplugin/php.vim %{_datadir}/nvim/runtime/ftplugin/pinfo.vim %{_datadir}/nvim/runtime/ftplugin/plaintex.vim +%{_datadir}/nvim/runtime/ftplugin/poke.vim %{_datadir}/nvim/runtime/ftplugin/postscr.vim %{_datadir}/nvim/runtime/ftplugin/procmail.vim %{_datadir}/nvim/runtime/ftplugin/prolog.vim %{_datadir}/nvim/runtime/ftplugin/protocols.vim +%{_datadir}/nvim/runtime/ftplugin/ps1.vim +%{_datadir}/nvim/runtime/ftplugin/ps1xml.vim %{_datadir}/nvim/runtime/ftplugin/pyrex.vim %{_datadir}/nvim/runtime/ftplugin/python.vim %{_datadir}/nvim/runtime/ftplugin/qf.vim %{_datadir}/nvim/runtime/ftplugin/quake.vim %{_datadir}/nvim/runtime/ftplugin/r.vim %{_datadir}/nvim/runtime/ftplugin/racc.vim +%{_datadir}/nvim/runtime/ftplugin/raku.vim %{_datadir}/nvim/runtime/ftplugin/readline.vim %{_datadir}/nvim/runtime/ftplugin/registry.vim %{_datadir}/nvim/runtime/ftplugin/reva.vim @@ -605,6 +662,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/ftplugin/sensors.vim %{_datadir}/nvim/runtime/ftplugin/services.vim %{_datadir}/nvim/runtime/ftplugin/setserial.vim +%{_datadir}/nvim/runtime/ftplugin/sexplib.vim %{_datadir}/nvim/runtime/ftplugin/sgml.vim %{_datadir}/nvim/runtime/ftplugin/sh.vim %{_datadir}/nvim/runtime/ftplugin/shada.vim @@ -617,6 +675,8 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/ftplugin/sshconfig.vim %{_datadir}/nvim/runtime/ftplugin/sudoers.vim %{_datadir}/nvim/runtime/ftplugin/svg.vim +%{_datadir}/nvim/runtime/ftplugin/swift.vim +%{_datadir}/nvim/runtime/ftplugin/swiftgyb.vim %{_datadir}/nvim/runtime/ftplugin/sysctl.vim %{_datadir}/nvim/runtime/ftplugin/systemd.vim %{_datadir}/nvim/runtime/ftplugin/systemverilog.vim @@ -625,10 +685,13 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/ftplugin/terminfo.vim %{_datadir}/nvim/runtime/ftplugin/tex.vim %{_datadir}/nvim/runtime/ftplugin/text.vim +%{_datadir}/nvim/runtime/ftplugin/tidy.vim %{_datadir}/nvim/runtime/ftplugin/tmux.vim %{_datadir}/nvim/runtime/ftplugin/treetop.vim %{_datadir}/nvim/runtime/ftplugin/tt2html.vim %{_datadir}/nvim/runtime/ftplugin/tutor.vim +%{_datadir}/nvim/runtime/ftplugin/typescript.vim +%{_datadir}/nvim/runtime/ftplugin/typescriptreact.vim %{_datadir}/nvim/runtime/ftplugin/udevconf.vim %{_datadir}/nvim/runtime/ftplugin/udevperm.vim %{_datadir}/nvim/runtime/ftplugin/udevrules.vim @@ -726,7 +789,6 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/indent/occam.vim %{_datadir}/nvim/runtime/indent/pascal.vim %{_datadir}/nvim/runtime/indent/perl.vim -%{_datadir}/nvim/runtime/indent/perl6.vim %{_datadir}/nvim/runtime/indent/php.vim %{_datadir}/nvim/runtime/indent/postscr.vim %{_datadir}/nvim/runtime/indent/pov.vim @@ -780,6 +842,16 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/indent/yaml.vim %{_datadir}/nvim/runtime/indent/zimbu.vim %{_datadir}/nvim/runtime/indent/zsh.vim +%{_datadir}/nvim/runtime/indent/bash.vim +%{_datadir}/nvim/runtime/indent/dune.vim +%{_datadir}/nvim/runtime/indent/elm.vim +%{_datadir}/nvim/runtime/indent/meson.vim +%{_datadir}/nvim/runtime/indent/ps1.vim +%{_datadir}/nvim/runtime/indent/raku.vim +%{_datadir}/nvim/runtime/indent/sshconfig.vim + +%dir %{_datadir}/nvim/runtime/indent/testdir/ +%{_datadir}/nvim/runtime/indent/testdir/runtest.vim %dir %{_datadir}/nvim/runtime/keymap %{_datadir}/nvim/runtime/keymap/accents.vim @@ -800,6 +872,8 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/keymap/dvorak.vim %{_datadir}/nvim/runtime/keymap/esperanto.vim %{_datadir}/nvim/runtime/keymap/esperanto_utf-8.vim +%{_datadir}/nvim/runtime/keymap/french-azerty.vim +%{_datadir}/nvim/runtime/keymap/german-qwertz.vim %{_datadir}/nvim/runtime/keymap/greek.vim %{_datadir}/nvim/runtime/keymap/greek_cp1253.vim %{_datadir}/nvim/runtime/keymap/greek_cp737.vim @@ -815,6 +889,8 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/keymap/hebrewp_utf-8.vim %{_datadir}/nvim/runtime/keymap/kana.vim %{_datadir}/nvim/runtime/keymap/kazakh-jcuken.vim +%{_datadir}/nvim/runtime/keymap/korean-dubeolsik_utf-8.vim +%{_datadir}/nvim/runtime/keymap/korean.vim %{_datadir}/nvim/runtime/keymap/lithuanian-baltic.vim %{_datadir}/nvim/runtime/keymap/magyar_utf-8.vim %{_datadir}/nvim/runtime/keymap/mongolian_utf-8.vim @@ -832,6 +908,8 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/keymap/russian-jcuken.vim %{_datadir}/nvim/runtime/keymap/russian-jcukenmac.vim %{_datadir}/nvim/runtime/keymap/russian-jcukenwin.vim +%{_datadir}/nvim/runtime/keymap/russian-jcukenwintype.vim +%{_datadir}/nvim/runtime/keymap/russian-typograph.vim %{_datadir}/nvim/runtime/keymap/russian-yawerty.vim %{_datadir}/nvim/runtime/keymap/serbian-latin.vim %{_datadir}/nvim/runtime/keymap/serbian-latin_utf-8.vim @@ -850,6 +928,8 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/keymap/tamil_tscii.vim %{_datadir}/nvim/runtime/keymap/thaana-phonetic_utf-8.vim %{_datadir}/nvim/runtime/keymap/thaana.vim +%{_datadir}/nvim/runtime/keymap/turkish-f.vim +%{_datadir}/nvim/runtime/keymap/turkish-q.vim %{_datadir}/nvim/runtime/keymap/ukrainian-dvorak.vim %{_datadir}/nvim/runtime/keymap/ukrainian-jcuken.vim %{_datadir}/nvim/runtime/keymap/vietnamese-telex_utf-8.vim @@ -860,9 +940,32 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/lua/man.lua %dir %{_datadir}/nvim/runtime/lua/vim +%{_datadir}/nvim/runtime/lua/vim/F.lua +%{_datadir}/nvim/runtime/lua/vim/_meta.lua %{_datadir}/nvim/runtime/lua/vim/compat.lua +%{_datadir}/nvim/runtime/lua/vim/highlight.lua %{_datadir}/nvim/runtime/lua/vim/inspect.lua +%{_datadir}/nvim/runtime/lua/vim/lsp.lua %{_datadir}/nvim/runtime/lua/vim/shared.lua +%{_datadir}/nvim/runtime/lua/vim/treesitter.lua +%{_datadir}/nvim/runtime/lua/vim/uri.lua + +%dir %{_datadir}/nvim/runtime/lua/vim/lsp/ +%{_datadir}/nvim/runtime/lua/vim/lsp/buf.lua +%{_datadir}/nvim/runtime/lua/vim/lsp/codelens.lua +%{_datadir}/nvim/runtime/lua/vim/lsp/diagnostic.lua +%{_datadir}/nvim/runtime/lua/vim/lsp/handlers.lua +%{_datadir}/nvim/runtime/lua/vim/lsp/log.lua +%{_datadir}/nvim/runtime/lua/vim/lsp/protocol.lua +%{_datadir}/nvim/runtime/lua/vim/lsp/rpc.lua +%{_datadir}/nvim/runtime/lua/vim/lsp/util.lua + +%dir %{_datadir}/nvim/runtime/lua/vim/treesitter/ +%{_datadir}/nvim/runtime/lua/vim/treesitter/health.lua +%{_datadir}/nvim/runtime/lua/vim/treesitter/highlighter.lua +%{_datadir}/nvim/runtime/lua/vim/treesitter/language.lua +%{_datadir}/nvim/runtime/lua/vim/treesitter/languagetree.lua +%{_datadir}/nvim/runtime/lua/vim/treesitter/query.lua %dir %{_datadir}/nvim/runtime/macros %{_datadir}/nvim/runtime/macros/editexisting.vim @@ -983,6 +1086,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/ada.vim %{_datadir}/nvim/runtime/syntax/aflex.vim %{_datadir}/nvim/runtime/syntax/ahdl.vim +%{_datadir}/nvim/runtime/syntax/aidl.vim %{_datadir}/nvim/runtime/syntax/alsaconf.vim %{_datadir}/nvim/runtime/syntax/amiga.vim %{_datadir}/nvim/runtime/syntax/aml.vim @@ -1015,18 +1119,22 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/ayacc.vim %{_datadir}/nvim/runtime/syntax/b.vim %{_datadir}/nvim/runtime/syntax/baan.vim +%{_datadir}/nvim/runtime/syntax/bash.vim %{_datadir}/nvim/runtime/syntax/basic.vim %{_datadir}/nvim/runtime/syntax/bc.vim %{_datadir}/nvim/runtime/syntax/bdf.vim %{_datadir}/nvim/runtime/syntax/bib.vim %{_datadir}/nvim/runtime/syntax/bindzone.vim %{_datadir}/nvim/runtime/syntax/blank.vim +%{_datadir}/nvim/runtime/syntax/bsdl.vim %{_datadir}/nvim/runtime/syntax/bst.vim %{_datadir}/nvim/runtime/syntax/btm.vim %{_datadir}/nvim/runtime/syntax/bzl.vim %{_datadir}/nvim/runtime/syntax/bzr.vim %{_datadir}/nvim/runtime/syntax/c.vim %{_datadir}/nvim/runtime/syntax/cabal.vim +%{_datadir}/nvim/runtime/syntax/cabalconfig.vim +%{_datadir}/nvim/runtime/syntax/cabalproject.vim %{_datadir}/nvim/runtime/syntax/calendar.vim %{_datadir}/nvim/runtime/syntax/catalog.vim %{_datadir}/nvim/runtime/syntax/cdl.vim @@ -1078,6 +1186,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/cynlib.vim %{_datadir}/nvim/runtime/syntax/cynpp.vim %{_datadir}/nvim/runtime/syntax/d.vim +%{_datadir}/nvim/runtime/syntax/dart.vim %{_datadir}/nvim/runtime/syntax/datascript.vim %{_datadir}/nvim/runtime/syntax/dcd.vim %{_datadir}/nvim/runtime/syntax/dcl.vim @@ -1121,6 +1230,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/eiffel.vim %{_datadir}/nvim/runtime/syntax/elf.vim %{_datadir}/nvim/runtime/syntax/elinks.vim +%{_datadir}/nvim/runtime/syntax/elm.vim %{_datadir}/nvim/runtime/syntax/elmfilt.vim %{_datadir}/nvim/runtime/syntax/erlang.vim %{_datadir}/nvim/runtime/syntax/eruby.vim @@ -1146,6 +1256,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/forth.vim %{_datadir}/nvim/runtime/syntax/fortran.vim %{_datadir}/nvim/runtime/syntax/foxpro.vim +%{_datadir}/nvim/runtime/syntax/fpcmake.vim %{_datadir}/nvim/runtime/syntax/framescript.vim %{_datadir}/nvim/runtime/syntax/freebasic.vim %{_datadir}/nvim/runtime/syntax/fstab.vim @@ -1154,6 +1265,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/gdb.vim %{_datadir}/nvim/runtime/syntax/gdmo.vim %{_datadir}/nvim/runtime/syntax/gedcom.vim +%{_datadir}/nvim/runtime/syntax/gift.vim %{_datadir}/nvim/runtime/syntax/git.vim %{_datadir}/nvim/runtime/syntax/gitcommit.vim %{_datadir}/nvim/runtime/syntax/gitconfig.vim @@ -1183,6 +1295,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/hastepreproc.vim %{_datadir}/nvim/runtime/syntax/hb.vim %{_datadir}/nvim/runtime/syntax/help.vim +%{_datadir}/nvim/runtime/syntax/help_ru.vim %{_datadir}/nvim/runtime/syntax/hercules.vim %{_datadir}/nvim/runtime/syntax/hex.vim %{_datadir}/nvim/runtime/syntax/hgcommit.vim @@ -1256,9 +1369,12 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/lprolog.vim %{_datadir}/nvim/runtime/syntax/lscript.vim %{_datadir}/nvim/runtime/syntax/lsl.vim +%{_datadir}/nvim/runtime/syntax/lsp_markdown.vim %{_datadir}/nvim/runtime/syntax/lss.vim %{_datadir}/nvim/runtime/syntax/lua.vim %{_datadir}/nvim/runtime/syntax/lynx.vim +%{_datadir}/nvim/runtime/syntax/m3build.vim +%{_datadir}/nvim/runtime/syntax/m3quake.vim %{_datadir}/nvim/runtime/syntax/m4.vim %{_datadir}/nvim/runtime/syntax/mail.vim %{_datadir}/nvim/runtime/syntax/mailaliases.vim @@ -1276,6 +1392,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/matlab.vim %{_datadir}/nvim/runtime/syntax/maxima.vim %{_datadir}/nvim/runtime/syntax/mel.vim +%{_datadir}/nvim/runtime/syntax/meson.vim %{_datadir}/nvim/runtime/syntax/messages.vim %{_datadir}/nvim/runtime/syntax/mf.vim %{_datadir}/nvim/runtime/syntax/mgl.vim @@ -1324,18 +1441,20 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/ocaml.vim %{_datadir}/nvim/runtime/syntax/occam.vim %{_datadir}/nvim/runtime/syntax/omnimark.vim +%{_datadir}/nvim/runtime/syntax/opam.vim %{_datadir}/nvim/runtime/syntax/openroad.vim %{_datadir}/nvim/runtime/syntax/opl.vim %{_datadir}/nvim/runtime/syntax/ora.vim %{_datadir}/nvim/runtime/syntax/pamconf.vim +%{_datadir}/nvim/runtime/syntax/pamenv.vim %{_datadir}/nvim/runtime/syntax/papp.vim %{_datadir}/nvim/runtime/syntax/pascal.vim %{_datadir}/nvim/runtime/syntax/passwd.vim +%{_datadir}/nvim/runtime/syntax/pbtxt.vim %{_datadir}/nvim/runtime/syntax/pcap.vim %{_datadir}/nvim/runtime/syntax/pccts.vim %{_datadir}/nvim/runtime/syntax/pdf.vim %{_datadir}/nvim/runtime/syntax/perl.vim -%{_datadir}/nvim/runtime/syntax/perl6.vim %{_datadir}/nvim/runtime/syntax/pf.vim %{_datadir}/nvim/runtime/syntax/pfmain.vim %{_datadir}/nvim/runtime/syntax/php.vim @@ -1352,6 +1471,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/plsql.vim %{_datadir}/nvim/runtime/syntax/po.vim %{_datadir}/nvim/runtime/syntax/pod.vim +%{_datadir}/nvim/runtime/syntax/poke.vim %{_datadir}/nvim/runtime/syntax/postscr.vim %{_datadir}/nvim/runtime/syntax/pov.vim %{_datadir}/nvim/runtime/syntax/povini.vim @@ -1365,7 +1485,10 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/promela.vim %{_datadir}/nvim/runtime/syntax/proto.vim %{_datadir}/nvim/runtime/syntax/protocols.vim +%{_datadir}/nvim/runtime/syntax/ps1.vim +%{_datadir}/nvim/runtime/syntax/ps1xml.vim %{_datadir}/nvim/runtime/syntax/psf.vim +%{_datadir}/nvim/runtime/syntax/psl.vim %{_datadir}/nvim/runtime/syntax/ptcap.vim %{_datadir}/nvim/runtime/syntax/purifylog.vim %{_datadir}/nvim/runtime/syntax/pyrex.vim @@ -1375,6 +1498,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/r.vim %{_datadir}/nvim/runtime/syntax/racc.vim %{_datadir}/nvim/runtime/syntax/radiance.vim +%{_datadir}/nvim/runtime/syntax/raku.vim %{_datadir}/nvim/runtime/syntax/raml.vim %{_datadir}/nvim/runtime/syntax/ratpoison.vim %{_datadir}/nvim/runtime/syntax/rc.vim @@ -1384,6 +1508,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/rebol.vim %{_datadir}/nvim/runtime/syntax/redif.vim %{_datadir}/nvim/runtime/syntax/registry.vim +%{_datadir}/nvim/runtime/syntax/rego.vim %{_datadir}/nvim/runtime/syntax/remind.vim %{_datadir}/nvim/runtime/syntax/resolv.vim %{_datadir}/nvim/runtime/syntax/reva.vim @@ -1420,6 +1545,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/sensors.vim %{_datadir}/nvim/runtime/syntax/services.vim %{_datadir}/nvim/runtime/syntax/setserial.vim +%{_datadir}/nvim/runtime/syntax/sexplib.vim %{_datadir}/nvim/runtime/syntax/sgml.vim %{_datadir}/nvim/runtime/syntax/sgmldecl.vim %{_datadir}/nvim/runtime/syntax/sgmllnx.vim @@ -1427,6 +1553,7 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/shada.vim %{_datadir}/nvim/runtime/syntax/sicad.vim %{_datadir}/nvim/runtime/syntax/sieve.vim +%{_datadir}/nvim/runtime/syntax/sil.vim %{_datadir}/nvim/runtime/syntax/simula.vim %{_datadir}/nvim/runtime/syntax/sinda.vim %{_datadir}/nvim/runtime/syntax/sindacmp.vim @@ -1476,6 +1603,8 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/sudoers.vim %{_datadir}/nvim/runtime/syntax/svg.vim %{_datadir}/nvim/runtime/syntax/svn.vim +%{_datadir}/nvim/runtime/syntax/swift.vim +%{_datadir}/nvim/runtime/syntax/swiftgyb.vim %{_datadir}/nvim/runtime/syntax/syncolor.vim %{_datadir}/nvim/runtime/syntax/synload.vim %{_datadir}/nvim/runtime/syntax/syntax.vim @@ -1518,6 +1647,8 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/syntax/tt2js.vim %{_datadir}/nvim/runtime/syntax/tutor.vim %{_datadir}/nvim/runtime/syntax/typescript.vim +%{_datadir}/nvim/runtime/syntax/typescriptcommon.vim +%{_datadir}/nvim/runtime/syntax/typescriptreact.vim %{_datadir}/nvim/runtime/syntax/uc.vim %{_datadir}/nvim/runtime/syntax/udevconf.vim %{_datadir}/nvim/runtime/syntax/udevperm.vim @@ -1596,6 +1727,10 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Sat Jul 03 2021 Andreas Schneider - 0.5.0-0 +- Update to version 0.5.0 + * https://github.com/neovim/neovim/releases/tag/v0.5.0 + * Mon Apr 19 2021 Andreas Schneider - 0.4.4-5 - resolves: #1909495 - Load installed vim plugins - Make build reproducible diff --git a/sources b/sources index 81610b3..a5bc522 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (neovim-0.4.4.tar.gz) = ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183 +SHA512 (neovim-0.5.0.tar.gz) = f6649f804faabb4104d3b28283932e40358c23990961f4ca7b380089318da312e59242746cee06387f4d881dd6514abbfec79c4063482383adfb4106e9e7a3a4 From 82db77b8eb89dc6104ccc03405f471f3c68bc3da Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 3 Jul 2021 06:01:47 +0200 Subject: [PATCH 03/13] Add missing BR for libtree-sitter-devel --- neovim.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/neovim.spec b/neovim.spec index 51ac587..dff33c9 100644 --- a/neovim.spec +++ b/neovim.spec @@ -64,6 +64,7 @@ BuildRequires: libtermkey-devel BuildRequires: libuv-devel >= 1.28.0 BuildRequires: libvterm-devel >= 0.1.1 BuildRequires: unibilium-devel +BuildRequires: libtree-sitter-devel %if 0%{?el7} # Lua 5.1 doesn't have bit32 BuildRequires: lua-bit32 From 06f723703c82a17a14b289645703ed4d92f6b9e8 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 3 Jul 2021 08:53:51 +0200 Subject: [PATCH 04/13] Fix bitop patch which is used by aarch64 aarch64 is still fails linking --- neovim-0.1.7-bitop.patch | 33 +++++++++++++++++++++++---------- neovim-0.4.4-findlua54.patch | 32 -------------------------------- neovim.spec | 3 --- 3 files changed, 23 insertions(+), 45 deletions(-) delete mode 100644 neovim-0.4.4-findlua54.patch diff --git a/neovim-0.1.7-bitop.patch b/neovim-0.1.7-bitop.patch index 26b8e22..6454858 100644 --- a/neovim-0.1.7-bitop.patch +++ b/neovim-0.1.7-bitop.patch @@ -1,8 +1,8 @@ -Index: neovim-0.2.1/CMakeLists.txt +Index: neovim-0.5.0/CMakeLists.txt =================================================================== ---- neovim-0.2.1.orig/CMakeLists.txt -+++ neovim-0.2.1/CMakeLists.txt -@@ -433,7 +433,7 @@ endforeach() +--- neovim-0.5.0.orig/CMakeLists.txt ++++ neovim-0.5.0/CMakeLists.txt +@@ -517,7 +517,7 @@ endforeach() # Find Lua interpreter include(LuaHelpers) @@ -10,14 +10,27 @@ Index: neovim-0.2.1/CMakeLists.txt +set(LUA_DEPENDENCIES lpeg mpack bit32) if(NOT LUA_PRG) foreach(CURRENT_LUA_PRG luajit lua5.1 lua5.2 lua) - # If LUA_PRG is set find_program() will not search -Index: neovim-0.2.1/src/nvim/ex_cmds.lua + unset(_CHECK_LUA_PRG CACHE) +Index: neovim-0.5.0/src/nvim/ex_cmds.lua =================================================================== ---- neovim-0.2.1.orig/src/nvim/ex_cmds.lua -+++ neovim-0.2.1/src/nvim/ex_cmds.lua +--- neovim-0.5.0.orig/src/nvim/ex_cmds.lua ++++ neovim-0.5.0/src/nvim/ex_cmds.lua @@ -1,4 +1,4 @@ -local bit = require 'bit' +local bit = require 'bit32' - -- Description of the values below is contained in ex_cmds_defs.h file. - local RANGE = 0x001 + local module = {} + +Index: neovim-0.5.0/src/nvim/generators/gen_ex_cmds.lua +=================================================================== +--- neovim-0.5.0.orig/src/nvim/generators/gen_ex_cmds.lua ++++ neovim-0.5.0/src/nvim/generators/gen_ex_cmds.lua +@@ -22,7 +22,7 @@ local defsfname = autodir .. '/ex_cmds_d + local enumfile = io.open(enumfname, 'w') + local defsfile = io.open(defsfname, 'w') + +-local bit = require 'bit' ++local bit = require 'bit32' + local ex_cmds = require('ex_cmds') + local defs = ex_cmds.cmds + local flags = ex_cmds.flags diff --git a/neovim-0.4.4-findlua54.patch b/neovim-0.4.4-findlua54.patch deleted file mode 100644 index e35fd71..0000000 --- a/neovim-0.4.4-findlua54.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 26a47f998c4884df7ba96a0f3ad6b268a832ae10 Mon Sep 17 00:00:00 2001 -From: Michel Alexandre Salim -Date: Mon, 31 Aug 2020 18:11:02 -0700 -Subject: [PATCH] Patch FindLua to support locating Lua 5.4 - -Lua 5.4 is out, and will be shipped with Fedora 33. - -Since there are architectures where LuaJIT is not available, being able -to compile against Lua 5.4 is needed to get Neovim to build for this -release. - -Signed-off-by: Michel Alexandre Salim ---- - cmake/FindLua.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake -index b669a49f2..7ba13e1f5 100644 ---- a/cmake/FindLua.cmake -+++ b/cmake/FindLua.cmake -@@ -42,7 +42,7 @@ unset(_lua_append_versions) - - # this is a function only to have all the variables inside go away automatically - function(_lua_set_version_vars) -- set(LUA_VERSIONS5 5.3 5.2 5.1 5.0) -+ set(LUA_VERSIONS5 5.4 5.3 5.2 5.1 5.0) - - if (Lua_FIND_VERSION_EXACT) - if (Lua_FIND_VERSION_COUNT GREATER 1) --- -2.26.2 - diff --git a/neovim.spec b/neovim.spec index dff33c9..eed76b8 100644 --- a/neovim.spec +++ b/neovim.spec @@ -25,8 +25,6 @@ Source0: https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{v Source1: sysinit.vim Source2: spec-template -# https://github.com/neovim/neovim/pull/12820 -Patch0: neovim-0.4.4-findlua54.patch Patch1000: neovim-0.1.7-bitop.patch BuildRequires: gcc-c++ @@ -90,7 +88,6 @@ parts of Vim, without compromise, and more. %setup -q %if %{without luajit} -%patch0 -p1 -b .findlua54 %patch1000 -p1 -b .bitop %endif From 9c10a8eb501d07d5e86100ff0159b2baffc9cf62 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 3 Jul 2021 12:24:15 +0200 Subject: [PATCH 05/13] Fix building with lua > 5.1 --- neovim-lua5.4.patch | 40 ++++++++++++++++++++++++++++++++++++++++ neovim.spec | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 neovim-lua5.4.patch diff --git a/neovim-lua5.4.patch b/neovim-lua5.4.patch new file mode 100644 index 0000000..486d10a --- /dev/null +++ b/neovim-lua5.4.patch @@ -0,0 +1,40 @@ +Index: neovim-0.5.0/src/nvim/lua/executor.c +=================================================================== +--- neovim-0.5.0.orig/src/nvim/lua/executor.c ++++ neovim-0.5.0/src/nvim/lua/executor.c +@@ -43,6 +43,15 @@ + + #include "luv/luv.h" + ++#if LUA_VERSION_NUM > 501 ++# define lua_objlen lua_rawlen ++# define lua_strlen lua_rawlen ++# define luaL_openlib(L,n,l,nup) luaL_setfuncs((L),(l),(nup)) ++# define luaL_register(L,n,l) (luaL_newlib(L,l)) ++# define lua_getfenv(L, idx) lua_getiuservalue((L), (idx), 1) ++# define lua_setfenv(L, idx) lua_setiuservalue((L), (idx), 1) ++#endif ++ + static int in_fast_callback = 0; + + typedef struct { +Index: neovim-0.5.0/src/nvim/lua/treesitter.c +=================================================================== +--- neovim-0.5.0.orig/src/nvim/lua/treesitter.c ++++ neovim-0.5.0/src/nvim/lua/treesitter.c +@@ -22,6 +22,15 @@ + #include "nvim/memline.h" + #include "nvim/buffer.h" + ++#if LUA_VERSION_NUM > 501 ++# define lua_objlen lua_rawlen ++# define lua_strlen lua_rawlen ++# define luaL_openlib(L,n,l,nup) luaL_setfuncs((L),(l),(nup)) ++# define luaL_register(L,n,l) (luaL_newlib(L,l)) ++# define lua_getfenv(L, idx) lua_getiuservalue((L), (idx), 1) ++# define lua_setfenv(L, idx) lua_setiuservalue((L), (idx), 1) ++#endif ++ + #define TS_META_PARSER "treesitter_parser" + #define TS_META_TREE "treesitter_tree" + #define TS_META_NODE "treesitter_node" diff --git a/neovim.spec b/neovim.spec index eed76b8..2124487 100644 --- a/neovim.spec +++ b/neovim.spec @@ -26,6 +26,7 @@ Source1: sysinit.vim Source2: spec-template Patch1000: neovim-0.1.7-bitop.patch +Patch1001: neovim-lua5.4.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -89,6 +90,7 @@ parts of Vim, without compromise, and more. %if %{without luajit} %patch1000 -p1 -b .bitop +%patch1001 -p1 -b .lua5.4 %endif %build From 1076947839a80fddc5df8712150db2940bedc956 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 5 Jul 2021 09:18:40 +0200 Subject: [PATCH 06/13] Raise BuildRequires for some libraries --- neovim.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/neovim.spec b/neovim.spec index 2124487..8093b40 100644 --- a/neovim.spec +++ b/neovim.spec @@ -15,7 +15,7 @@ Name: neovim Version: 0.5.0 -Release: 0%{?dist} +Release: 1%{?dist} License: ASL 2.0 Summary: Vim-fork focused on extensibility and agility @@ -43,17 +43,20 @@ BuildRequires: lua5.1-lpeg BuildRequires: lua5.1-mpack BuildRequires: lua5.1-luv-devel >= %{luv_min_ver} Requires: lua5.1-luv >= %{luv_min_ver} +# else with luajit %else BuildRequires: lua-devel %if 0%{?fedora} >= 33 # built-in bit32 removed in Lua 5.4 BuildRequires: lua-bit32 Requires: lua-bit32 +# endif fedora >= 33 %endif BuildRequires: lua-lpeg BuildRequires: lua-mpack BuildRequires: lua-luv-devel >= %{luv_min_ver} Requires: lua-luv >= %{luv_min_ver} +# endif with luajit %endif %if %{with jemalloc} BuildRequires: jemalloc-devel @@ -61,19 +64,13 @@ BuildRequires: jemalloc-devel BuildRequires: msgpack-devel >= 3.1.0 BuildRequires: libtermkey-devel BuildRequires: libuv-devel >= 1.28.0 -BuildRequires: libvterm-devel >= 0.1.1 +BuildRequires: libvterm-devel >= 0.1.4 BuildRequires: unibilium-devel -BuildRequires: libtree-sitter-devel -%if 0%{?el7} -# Lua 5.1 doesn't have bit32 -BuildRequires: lua-bit32 -Requires: lua-bit32 -%else +BuildRequires: libtree-sitter-devel >= 0.20.0 Suggests: (python2-neovim if python2) Suggests: (python3-neovim if python3) # XSel provides access to the system clipboard Recommends: xsel -%endif %description Neovim is a refactor - and sometimes redactor - in the tradition of @@ -1727,6 +1724,9 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Mon Jul 05 2021 Andreas Schneider - 0.5.0-1 +- Raise BuildRequires for some libraries + * Sat Jul 03 2021 Andreas Schneider - 0.5.0-0 - Update to version 0.5.0 * https://github.com/neovim/neovim/releases/tag/v0.5.0 From ee6c3c8f044fb768504345ff9600377ccedfbd72 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 8 Jul 2021 20:01:10 +0200 Subject: [PATCH 07/13] Fixed execute bits of bat and awk files --- neovim.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neovim.spec b/neovim.spec index 8093b40..0a1b330 100644 --- a/neovim.spec +++ b/neovim.spec @@ -15,7 +15,7 @@ Name: neovim Version: 0.5.0 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Summary: Vim-fork focused on extensibility and agility @@ -115,6 +115,9 @@ install -d -m0755 %{buildroot}%{_datadir}/pixmaps install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %fdupes %{buildroot}%{_datadir}/ +# Fix exec bits +find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ + -print -exec chmod -x '{}' \; %find_lang nvim %files -f nvim.lang @@ -1724,6 +1727,9 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Thu Jul 08 2021 Andreas Schneider - 0.5.0-2 +- Fixed execute bits of bat and awk files + * Mon Jul 05 2021 Andreas Schneider - 0.5.0-1 - Raise BuildRequires for some libraries From 0323f0de6d223c8d80518abcd24f4ef8b791d359 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:57:46 +0000 Subject: [PATCH 08/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- neovim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neovim.spec b/neovim.spec index 0a1b330..8f39dad 100644 --- a/neovim.spec +++ b/neovim.spec @@ -15,7 +15,7 @@ Name: neovim Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Summary: Vim-fork focused on extensibility and agility @@ -1727,6 +1727,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jul 08 2021 Andreas Schneider - 0.5.0-2 - Fixed execute bits of bat and awk files From e623ec66bd4c1ff5cd38da14e246334070161e4f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 23 Jul 2021 07:10:26 +0200 Subject: [PATCH 09/13] Build with lua-5.1 on platforms where luajit is not available resolves: rhbz#1983288 --- neovim-cmake-lua-5.1.patch | 13 +++++ ....1.7-bitop.patch => neovim-lua-bit32.patch | 0 neovim-lua5.4.patch | 40 ---------------- neovim.spec | 48 ++++++++----------- 4 files changed, 32 insertions(+), 69 deletions(-) create mode 100644 neovim-cmake-lua-5.1.patch rename neovim-0.1.7-bitop.patch => neovim-lua-bit32.patch (100%) delete mode 100644 neovim-lua5.4.patch diff --git a/neovim-cmake-lua-5.1.patch b/neovim-cmake-lua-5.1.patch new file mode 100644 index 0000000..c62ad49 --- /dev/null +++ b/neovim-cmake-lua-5.1.patch @@ -0,0 +1,13 @@ +Index: neovim-0.5.0/CMakeLists.txt +=================================================================== +--- neovim-0.5.0.orig/CMakeLists.txt ++++ neovim-0.5.0/CMakeLists.txt +@@ -413,7 +413,7 @@ endif() + option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF) + + if(PREFER_LUA) +- find_package(Lua 5.1 REQUIRED) ++ find_package(Lua 5.1 EXACT REQUIRED) + set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR}) + set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES}) + # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped. diff --git a/neovim-0.1.7-bitop.patch b/neovim-lua-bit32.patch similarity index 100% rename from neovim-0.1.7-bitop.patch rename to neovim-lua-bit32.patch diff --git a/neovim-lua5.4.patch b/neovim-lua5.4.patch deleted file mode 100644 index 486d10a..0000000 --- a/neovim-lua5.4.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: neovim-0.5.0/src/nvim/lua/executor.c -=================================================================== ---- neovim-0.5.0.orig/src/nvim/lua/executor.c -+++ neovim-0.5.0/src/nvim/lua/executor.c -@@ -43,6 +43,15 @@ - - #include "luv/luv.h" - -+#if LUA_VERSION_NUM > 501 -+# define lua_objlen lua_rawlen -+# define lua_strlen lua_rawlen -+# define luaL_openlib(L,n,l,nup) luaL_setfuncs((L),(l),(nup)) -+# define luaL_register(L,n,l) (luaL_newlib(L,l)) -+# define lua_getfenv(L, idx) lua_getiuservalue((L), (idx), 1) -+# define lua_setfenv(L, idx) lua_setiuservalue((L), (idx), 1) -+#endif -+ - static int in_fast_callback = 0; - - typedef struct { -Index: neovim-0.5.0/src/nvim/lua/treesitter.c -=================================================================== ---- neovim-0.5.0.orig/src/nvim/lua/treesitter.c -+++ neovim-0.5.0/src/nvim/lua/treesitter.c -@@ -22,6 +22,15 @@ - #include "nvim/memline.h" - #include "nvim/buffer.h" - -+#if LUA_VERSION_NUM > 501 -+# define lua_objlen lua_rawlen -+# define lua_strlen lua_rawlen -+# define luaL_openlib(L,n,l,nup) luaL_setfuncs((L),(l),(nup)) -+# define luaL_register(L,n,l) (luaL_newlib(L,l)) -+# define lua_getfenv(L, idx) lua_getiuservalue((L), (idx), 1) -+# define lua_setfenv(L, idx) lua_setiuservalue((L), (idx), 1) -+#endif -+ - #define TS_META_PARSER "treesitter_parser" - #define TS_META_TREE "treesitter_tree" - #define TS_META_NODE "treesitter_node" diff --git a/neovim.spec b/neovim.spec index 8f39dad..43f5a86 100644 --- a/neovim.spec +++ b/neovim.spec @@ -5,13 +5,9 @@ %bcond_with luajit %endif -%if %{with luajit} -%global luaver 5.1 -%else -%global luaver %{lua_version} -%endif +%global lua_version 5.1 -%global luv_min_ver 1.30.0 +%global luv_min_ver 1.41.0 Name: neovim Version: 0.5.0 @@ -25,8 +21,8 @@ Source0: https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{v Source1: sysinit.vim Source2: spec-template -Patch1000: neovim-0.1.7-bitop.patch -Patch1001: neovim-lua5.4.patch +Patch1000: neovim-lua-bit32.patch +Patch1001: neovim-cmake-lua-5.1.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -39,25 +35,14 @@ BuildRequires: gcc # luajit implements version 5.1 of the lua language spec, so it needs the # compat versions of libs. BuildRequires: luajit-devel +%else +BuildRequires: compat-lua +BuildRequires: compat-lua-devel +# /with luajit +%endif BuildRequires: lua5.1-lpeg BuildRequires: lua5.1-mpack BuildRequires: lua5.1-luv-devel >= %{luv_min_ver} -Requires: lua5.1-luv >= %{luv_min_ver} -# else with luajit -%else -BuildRequires: lua-devel -%if 0%{?fedora} >= 33 -# built-in bit32 removed in Lua 5.4 -BuildRequires: lua-bit32 -Requires: lua-bit32 -# endif fedora >= 33 -%endif -BuildRequires: lua-lpeg -BuildRequires: lua-mpack -BuildRequires: lua-luv-devel >= %{luv_min_ver} -Requires: lua-luv >= %{luv_min_ver} -# endif with luajit -%endif %if %{with jemalloc} BuildRequires: jemalloc-devel %endif @@ -71,6 +56,7 @@ Suggests: (python2-neovim if python2) Suggests: (python3-neovim if python3) # XSel provides access to the system clipboard Recommends: xsel +Requires: lua5.1-luv >= %{luv_min_ver} %description Neovim is a refactor - and sometimes redactor - in the tradition of @@ -86,8 +72,8 @@ parts of Vim, without compromise, and more. %setup -q %if %{without luajit} -%patch1000 -p1 -b .bitop -%patch1001 -p1 -b .lua5.4 +%patch1000 -p1 +%patch1001 -p1 %endif %build @@ -96,10 +82,10 @@ HOSTNAME=koji USERNAME=koji %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DPREFER_LUA=%{?with_luajit:OFF}%{!?with_luajit:ON} \ - -DLUA_PRG=%{_bindir}/%{?with_luajit:luajit}%{!?with_luajit:lua} \ + -DLUA_PRG=%{_bindir}/%{?with_luajit:luajit}%{!?with_luajit:lua-5.1} \ -DENABLE_JEMALLOC=%{?with_jemalloc:ON}%{!?with_jemalloc:OFF} \ - -DLIBLUV_INCLUDE_DIR=%{_includedir}/lua-%{luaver} \ - -DLIBLUV_LIBRARY=%{_libdir}/lua/%{luaver}/luv.so \ + -DLIBLUV_INCLUDE_DIR=%{_includedir}/lua-%{lua_version} \ + -DLIBLUV_LIBRARY=%{_libdir}/lua/%{lua_version}/luv.so \ %cmake_build @@ -1727,6 +1713,10 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Fri Jul 30 2021 Andreas Schneider - 0.5.0-3 +- resolves: rhbz#1983288 - Build with lua-5.1 on platforms where luajit is not + available + * Thu Jul 22 2021 Fedora Release Engineering - 0.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 0c1c85bd9020c3c26e266d2a468bc29dce8fed8e Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 30 Jul 2021 07:32:07 +0200 Subject: [PATCH 10/13] Bump release --- neovim.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neovim.spec b/neovim.spec index 43f5a86..047920d 100644 --- a/neovim.spec +++ b/neovim.spec @@ -11,7 +11,7 @@ Name: neovim Version: 0.5.0 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Summary: Vim-fork focused on extensibility and agility @@ -1713,7 +1713,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog -* Fri Jul 30 2021 Andreas Schneider - 0.5.0-3 +* Fri Jul 30 2021 Andreas Schneider - 0.5.0-4 - resolves: rhbz#1983288 - Build with lua-5.1 on platforms where luajit is not available From f6f7626994afa6642964344f1ad729a7202b5d63 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 30 Jul 2021 07:43:52 +0200 Subject: [PATCH 11/13] Add missing BR for lua-bit32 --- neovim.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neovim.spec b/neovim.spec index 047920d..20e866f 100644 --- a/neovim.spec +++ b/neovim.spec @@ -36,8 +36,10 @@ BuildRequires: gcc # compat versions of libs. BuildRequires: luajit-devel %else +# lua5.1 BuildRequires: compat-lua BuildRequires: compat-lua-devel +BuildRequires: lua5.1-bit32 # /with luajit %endif BuildRequires: lua5.1-lpeg From 796b74fdd60cecdbf04a5d97410d88090196543f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 30 Jul 2021 19:34:35 +0200 Subject: [PATCH 12/13] Build with luajit2.1-luv when we use luajit --- neovim.spec | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/neovim.spec b/neovim.spec index 20e866f..157b5c5 100644 --- a/neovim.spec +++ b/neovim.spec @@ -5,13 +5,25 @@ %bcond_with luajit %endif -%global lua_version 5.1 - %global luv_min_ver 1.41.0 +%if %{with luajit} +%global luajit_version 2.1 +%global lua_prg %{_bindir}/luajit + +%global luv_include_dir %{_includedir}/luajit-%{luajit_version} +%global luv_library %{_libdir}/luajit/%{luajit_version}/luv.so +%else +%global lua_version 5.1 +%global lua_prg %{_bindir}/lua-5.1 + +%global luv_include_dir %{_includedir}/lua-%{lua_version} +%global luv_library %{_libdir}/lua/%{lua_version}/luv.so +%endif + Name: neovim Version: 0.5.0 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Summary: Vim-fork focused on extensibility and agility @@ -35,16 +47,19 @@ BuildRequires: gcc # luajit implements version 5.1 of the lua language spec, so it needs the # compat versions of libs. BuildRequires: luajit-devel +BuildRequires: luajit2.1-luv-devel >= %{luv_min_ver} +Requires: luajit2.1-luv >= %{luv_min_ver} %else # lua5.1 BuildRequires: compat-lua BuildRequires: compat-lua-devel BuildRequires: lua5.1-bit32 +BuildRequires: lua5.1-luv-devel >= %{luv_min_ver} +Requires: lua5.1-luv >= %{luv_min_ver} # /with luajit %endif BuildRequires: lua5.1-lpeg BuildRequires: lua5.1-mpack -BuildRequires: lua5.1-luv-devel >= %{luv_min_ver} %if %{with jemalloc} BuildRequires: jemalloc-devel %endif @@ -58,7 +73,6 @@ Suggests: (python2-neovim if python2) Suggests: (python3-neovim if python3) # XSel provides access to the system clipboard Recommends: xsel -Requires: lua5.1-luv >= %{luv_min_ver} %description Neovim is a refactor - and sometimes redactor - in the tradition of @@ -84,10 +98,10 @@ HOSTNAME=koji USERNAME=koji %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DPREFER_LUA=%{?with_luajit:OFF}%{!?with_luajit:ON} \ - -DLUA_PRG=%{_bindir}/%{?with_luajit:luajit}%{!?with_luajit:lua-5.1} \ + -DLUA_PRG=%{lua_prg} \ -DENABLE_JEMALLOC=%{?with_jemalloc:ON}%{!?with_jemalloc:OFF} \ - -DLIBLUV_INCLUDE_DIR=%{_includedir}/lua-%{lua_version} \ - -DLIBLUV_LIBRARY=%{_libdir}/lua/%{lua_version}/luv.so \ + -DLIBLUV_INCLUDE_DIR=%{luv_include_dir} \ + -DLIBLUV_LIBRARY=%{luv_library} %cmake_build @@ -1715,6 +1729,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Fri Jul 30 2021 Andreas Schneider - 0.5.0-5 +- Build with luajit2.1-luv when we use luajit + * Fri Jul 30 2021 Andreas Schneider - 0.5.0-4 - resolves: rhbz#1983288 - Build with lua-5.1 on platforms where luajit is not available From fad41c84b531f67f7a6166092ed0be7d4c60b24a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 27 Sep 2021 20:39:51 +0200 Subject: [PATCH 13/13] Update to version 0.5.1 --- .gitignore | 1 + neovim.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 15efb93..81fee83 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /neovim-0.4.3.tar.gz /neovim-0.4.4.tar.gz /neovim-0.5.0.tar.gz +/neovim-0.5.1.tar.gz diff --git a/neovim.spec b/neovim.spec index 157b5c5..c2f16b7 100644 --- a/neovim.spec +++ b/neovim.spec @@ -22,8 +22,8 @@ %endif Name: neovim -Version: 0.5.0 -Release: 5%{?dist} +Version: 0.5.1 +Release: 1%{?dist} License: ASL 2.0 Summary: Vim-fork focused on extensibility and agility @@ -953,6 +953,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/lua/vim/uri.lua %dir %{_datadir}/nvim/runtime/lua/vim/lsp/ +%{_datadir}/nvim/runtime/lua/vim/lsp/_snippet.lua %{_datadir}/nvim/runtime/lua/vim/lsp/buf.lua %{_datadir}/nvim/runtime/lua/vim/lsp/codelens.lua %{_datadir}/nvim/runtime/lua/vim/lsp/diagnostic.lua @@ -1729,6 +1730,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Mon Sep 27 2021 Andreas Schneider - 0.5.1-1 +- Update to version 0.5.1 + * Fri Jul 30 2021 Andreas Schneider - 0.5.0-5 - Build with luajit2.1-luv when we use luajit diff --git a/sources b/sources index a5bc522..255e32d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (neovim-0.5.0.tar.gz) = f6649f804faabb4104d3b28283932e40358c23990961f4ca7b380089318da312e59242746cee06387f4d881dd6514abbfec79c4063482383adfb4106e9e7a3a4 +SHA512 (neovim-0.5.1.tar.gz) = a5a976c4998e821e0d9a9038d3f0c9e7c424a951f6bfc6d75898916d6a004ac668f31a34c3472fc4fca6b1d9652ac662b06780dd04dc6a77ecdc81564ec05709