From 64eacecdb2775d931f72dc7fdef30563be2f1528b2f1b3987885f2931a7d6fc7 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 20 Dec 2018 14:46:57 +0000
Subject: [PATCH] Accepting request 660221 from home:mcepl:branches:editors

- Add to the system-wide configuration file extension of runtimepath by
  /usr/share/vim/site, so that neovim uses other Vim plugins installed
  from packages.
- Add /usr/share/vim/site tree of directories to be owned by neovim as
  well.

OBS-URL: https://build.opensuse.org/request/show/660221
OBS-URL: https://build.opensuse.org/package/show/editors/neovim?expand=0&rev=44
---
 neovim.changes |  9 +++++++++
 neovim.spec    | 15 +++++++++++++++
 sysinit.vim    |  3 +++
 3 files changed, 27 insertions(+)

diff --git a/neovim.changes b/neovim.changes
index e32a778..b7a9e25 100644
--- a/neovim.changes
+++ b/neovim.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Dec 20 00:11:35 UTC 2018 - Matej Cepl <mcepl@suse.com>
+
+- Add to the system-wide configuration file extension of runtimepath by
+  /usr/share/vim/site, so that neovim uses other Vim plugins installed
+  from packages.
+- Add /usr/share/vim/site tree of directories to be owned by neovim as
+  well.
+
 -------------------------------------------------------------------
 Thu Dec  6 09:12:15 UTC 2018 - Martin Pluskal <mpluskal@suse.com>
 
diff --git a/neovim.spec b/neovim.spec
index c45abb4..ad89e46 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -82,6 +82,8 @@ parts of Vim, without compromise, and more.
 
 %lang_package
 
+%define vimplugin_dir %{_datadir}/vim/site
+
 %prep
 %setup -q
 %patch0 -p1
@@ -120,6 +122,9 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/nvim/template.spec
 
 %suse_update_desktop_file -r nvim ConsoleOnly Application Utility TextEditor
 
+# vim/site directories for plugins shared with vim
+mkdir -p %{buildroot}%{vimplugin_dir}/{after,after/syntax,autoload,colors,doc,ftdetect,plugin,syntax}
+
 %fdupes %{buildroot}%{_datadir}/
 %find_lang nvim
 
@@ -145,6 +150,16 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/nvim/template.spec
 %{_mandir}/man1/nvim.1%{?ext_man}
 %dir %{_sysconfdir}/nvim
 %config(noreplace) %{_sysconfdir}/nvim/sysinit.vim
+%dir %{_datadir}/vim
+%dir %{vimplugin_dir}/
+%dir %{vimplugin_dir}/after
+%dir %{vimplugin_dir}/after/syntax
+%dir %{vimplugin_dir}/autoload
+%dir %{vimplugin_dir}/colors
+%dir %{vimplugin_dir}/doc
+%dir %{vimplugin_dir}/ftdetect
+%dir %{vimplugin_dir}/plugin
+%dir %{vimplugin_dir}/syntax
 
 %files lang -f nvim.lang
 
diff --git a/sysinit.vim b/sysinit.vim
index 66037d3..7d2823e 100644
--- a/sysinit.vim
+++ b/sysinit.vim
@@ -1,3 +1,6 @@
+" In order for neovim to use installed plugins shared with vim
+set runtimepath+=/usr/share/vim/site
+
 augroup Fedora
   autocmd!
   " RPM spec file template