- Change icon 'neovim.svg' installation directory from

%{_datadir}/pixmaps/%{name}.svg
  to
    %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
  as per dimstar request.
- Fix neovim.changes indentation.

- Remove unneeded patches that were applied by upstream:
    * neovim_fix_locale_dir_01.patch
    * neovim_fix_locale_dir_02.patch
- Update to version 0.1.3.
- Changelog:
    Features:
      * f2ae5a9 Add TextYankPost and TextDeletePost autocmds
      * 44b2cef bufhl: new mechanism for plugins to add highlights
        to a buffer
      * 39c3842 Make set{qf,loc}list() take {title}
      * 77a7ca4 'shortmess': Add "F" flag. #4446
      * 99d4c8c keymap: Support <D-...> (super/command key).
    Fixes:
      * 14c9b30 terminal.c: temporary fix for incorrect paste
        handling
    Notable changes:
      * 50e129f defaults: Enable syntax and filetype plugins.
      * 4e39eee upgrade libvterm (improves terminal reflow)

OBS-URL: https://build.opensuse.org/package/show/editors/neovim?expand=0&rev=3

neovim-0.1.2.tar.gz

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

neovim-0.1.3.tar.gz

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

neovim.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Thu Apr 14 01:44:02 UTC 2016 - ronisbr@gmail.com
+
+- Change icon 'neovim.svg' installation directory from
+    %{_datadir}/pixmaps/%{name}.svg
+  to
+    %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+  as per dimstar request.
+- Fix neovim.changes indentation.
+
+-------------------------------------------------------------------
+Sat Apr  9 22:09:40 UTC 2016 - ronisbr@gmail.com
+
+- Remove unneeded patches that were applied by upstream:
+    * neovim_fix_locale_dir_01.patch
+    * neovim_fix_locale_dir_02.patch
+- Update to version 0.1.3.
+- Changelog:
+    Features:
+      * f2ae5a9 Add TextYankPost and TextDeletePost autocmds
+      * 44b2cef bufhl: new mechanism for plugins to add highlights
+        to a buffer
+      * 39c3842 Make set{qf,loc}list() take {title}
+      * 77a7ca4 'shortmess': Add "F" flag. #4446
+      * 99d4c8c keymap: Support <D-...> (super/command key).
+    Fixes:
+      * 14c9b30 terminal.c: temporary fix for incorrect paste
+        handling
+    Notable changes:
+      * 50e129f defaults: Enable syntax and filetype plugins.
+      * 4e39eee upgrade libvterm (improves terminal reflow)
+
 -------------------------------------------------------------------
 Tue Mar  8 13:25:23 UTC 2016 - ronisbr@gmail.com
 

neovim.spec

@@ -17,7 +17,7 @@
 
 
 Name:           neovim
-Version:        0.1.2
+Version:        0.1.3
 Release:        0
 Summary:        Vim-fork focused on extensibility and agility
 License:        Apache-2.0
@@ -26,13 +26,10 @@ Url:            https://neovim.io/
 Source:         https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        neovim.svg
 Source2:        neovim.desktop
-# PATCH-FIX-UPSTREAM neovim_fix_locale_dir_01.patch gh#neovim/neovim#PR4221 - Install *.mo files correctly.
-Patch0:         neovim_fix_locale_dir_01.patch
-# PATCH-FIX-UPSTREAM neovim_fix_locale_dir_02.patch gh#neovim/neovim#PR4277 - Install *.mo files into the "standard" directory.
-Patch1:         neovim_fix_locale_dir_02.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
+BuildRequires:  hicolor-icon-theme
 BuildRequires:  libmsgpack-devel >= 1.2.0
 BuildRequires:  libmsgpackc-devel >= 1.2.0
 BuildRequires:  libuv-devel
@@ -61,8 +58,6 @@ the good parts of Vim, without compromise, and more.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 # Remove __DATE__ and __TIME__
 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
@@ -86,7 +81,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 popd
 
 # Install icon.
-install -D -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/%{name}.svg
+install -D -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 # Install desktop file.
 install -D -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -100,9 +95,11 @@ install -D -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/%{name}.deskt
 
 %post
 %desktop_database_post
+%icon_theme_cache_post
 
 %postun
 %desktop_database_postun
+%icon_theme_cache_postun
 
 %files -f nvim.lang
 %defattr(-,root,root)
@@ -110,7 +107,7 @@ install -D -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/%{name}.deskt
 %{_bindir}/nvim
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/nvim/
-%{_datadir}/pixmaps/%{name}.svg
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_mandir}/man1/nvim.1%{ext_man}
 
 %changelog

neovim_fix_locale_dir_01.patch

@@ -1,61 +0,0 @@
-From 0690c3358d10efdcc5cbd1ee0cace005ef139c29 Mon Sep 17 00:00:00 2001
-From: Jun T <takimoto-j@kba.biglobe.ne.jp>
-Date: Wed, 10 Feb 2016 16:45:37 +0900
-Subject: [PATCH 1/2] install *.mo files correctly
-
----
- src/nvim/po/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
-index 6687918..a660a44 100644
---- a/src/nvim/po/CMakeLists.txt
-+++ b/src/nvim/po/CMakeLists.txt
-@@ -72,8 +72,8 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
- 
-     install_helper(
-       FILES ${moFile}
--      DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${name}/LC_MESSAGES
--      RENAME nvim.mo)
-+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/lang/${name}/LC_MESSAGES
-+      RENAME vim.mo)
- 
-     list(APPEND LANGUAGE_MO_FILES ${moFile})
-   endmacro()
-
-From 81f54f909ec896e65766734e0bd848a3cfa270a2 Mon Sep 17 00:00:00 2001
-From: Jun T <takimoto-j@kba.biglobe.ne.jp>
-Date: Wed, 10 Feb 2016 21:34:10 +0900
-Subject: [PATCH 2/2] set VIMPACKAGE to "nvim"
-
----
- src/nvim/po/CMakeLists.txt | 2 +-
- src/nvim/vim.h             | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
-index a660a44..d1e08db 100644
---- a/src/nvim/po/CMakeLists.txt
-+++ b/src/nvim/po/CMakeLists.txt
-@@ -73,7 +73,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
-     install_helper(
-       FILES ${moFile}
-       DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/lang/${name}/LC_MESSAGES
--      RENAME vim.mo)
-+      RENAME nvim.mo)
- 
-     list(APPEND LANGUAGE_MO_FILES ${moFile})
-   endmacro()
-diff --git a/src/nvim/vim.h b/src/nvim/vim.h
-index 5f9785a..762d349 100644
---- a/src/nvim/vim.h
-+++ b/src/nvim/vim.h
-@@ -30,7 +30,7 @@ Error: configure did not run properly.Check auto/config.log.
- 
- /* Can't use "PACKAGE" here, conflicts with a Perl include file. */
- #ifndef VIMPACKAGE
--# define VIMPACKAGE     "vim"
-+# define VIMPACKAGE     "nvim"
- #endif
- 
- #include "nvim/os/os_defs.h"       /* bring lots of system header files */

neovim_fix_locale_dir_02.patch

@@ -1,145 +0,0 @@
-From 1a15cf84c29c984d600f438122edc70be2ac91a1 Mon Sep 17 00:00:00 2001
-From: Jun T <takimoto-j@kba.biglobe.ne.jp>
-Date: Wed, 17 Feb 2016 23:16:25 +0900
-Subject: [PATCH] build: install *.mo into the "standard" directory
-
-Change POROJECT_NAME to 'nvim', and use it as the gettext
-domain name. The *.mo files, previously installed as
-$runtime/lang/xx/LC_MESSAGES/nvim.mo, are now installed as
-$prefix/locale/xx/LC_MESSAGES/nvim.mo.
----
- CMakeLists.txt             |  2 +-
- config/config.h.in         |  3 +++
- src/nvim/main.c            |  8 ++++++--
- src/nvim/mbyte.c           |  4 ++--
- src/nvim/os/env.c          | 10 +++++-----
- src/nvim/po/CMakeLists.txt |  4 ++--
- src/nvim/vim.h             |  6 ------
- 7 files changed, 19 insertions(+), 18 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 527a085..acd9dc1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,5 @@
- cmake_minimum_required(VERSION 2.8.7)
--project(NEOVIM)
-+project(nvim)
- 
- # Point CMake at any custom modules we may ship
- list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
-diff --git a/config/config.h.in b/config/config.h.in
-index 27705f8..d13e7de 100644
---- a/config/config.h.in
-+++ b/config/config.h.in
-@@ -12,6 +12,9 @@
- #define ARCH_32
- #endif
- 
-+#define PROJECT_NAME "@PROJECT_NAME@"
-+#define LOCALE_INSTALL_DIR "@CMAKE_INSTALL_FULL_LOCALEDIR@"
-+
- #cmakedefine HAVE__NSGETENVIRON
- #cmakedefine HAVE_FD_CLOEXEC
- #cmakedefine HAVE_FSEEKO
-diff --git a/src/nvim/main.c b/src/nvim/main.c
-index d3cdfe3..a2aca65 100644
---- a/src/nvim/main.c
-+++ b/src/nvim/main.c
-@@ -657,6 +657,9 @@ static void init_locale(void)
-   setlocale(LC_NUMERIC, "C");
- # endif
- 
-+# ifdef LOCALE_INSTALL_DIR    // gnu/linux standard: $prefix/share/locale
-+  bindtextdomain(PROJECT_NAME, LOCALE_INSTALL_DIR);
-+# else                        // old vim style: $runtime/lang
-   {
-     char_u  *p;
- 
-@@ -665,11 +668,12 @@ static void init_locale(void)
-     p = (char_u *)vim_getenv("VIMRUNTIME");
-     if (p != NULL && *p != NUL) {
-       vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p);
--      bindtextdomain(VIMPACKAGE, (char *)NameBuff);
-+      bindtextdomain(PROJECT_NAME, (char *)NameBuff);
-     }
-     xfree(p);
--    textdomain(VIMPACKAGE);
-   }
-+# endif
-+  textdomain(PROJECT_NAME);
-   TIME_MSG("locale set");
- }
- #endif
-diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
-index fdd83f9..f0a2499 100644
---- a/src/nvim/mbyte.c
-+++ b/src/nvim/mbyte.c
-@@ -571,8 +571,8 @@ char_u * mb_init(void)
- #ifdef HAVE_WORKING_LIBINTL
-   /* GNU gettext 0.10.37 supports this feature: set the codeset used for
-    * translated messages independently from the current locale. */
--  (void)bind_textdomain_codeset(VIMPACKAGE,
--      enc_utf8 ? "utf-8" : (char *)p_enc);
-+  (void)bind_textdomain_codeset(PROJECT_NAME,
-+                                enc_utf8 ? "utf-8" : (char *)p_enc);
- #endif
- 
- 
-diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
-index c180406..10f56b5 100644
---- a/src/nvim/os/env.c
-+++ b/src/nvim/os/env.c
-@@ -742,15 +742,15 @@ char_u * home_replace_save(buf_T *buf, char_u *src) FUNC_ATTR_NONNULL_RET
- void vim_setenv(const char *name, const char *val)
- {
-   os_setenv(name, val, 1);
--  /*
--   * When setting $VIMRUNTIME adjust the directory to find message
--   * translations to $VIMRUNTIME/lang.
--   */
-+#ifndef LOCALE_INSTALL_DIR
-+  // When setting $VIMRUNTIME adjust the directory to find message
-+  // translations to $VIMRUNTIME/lang.
-   if (*val != NUL && STRICMP(name, "VIMRUNTIME") == 0) {
-     char *buf = (char *)concat_str((char_u *)val, (char_u *)"/lang");
--    bindtextdomain(VIMPACKAGE, buf);
-+    bindtextdomain(PROJECT_NAME, buf);
-     xfree(buf);
-   }
-+#endif
- }
- 
- 
-diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
-index d1e08db..184c489 100644
---- a/src/nvim/po/CMakeLists.txt
-+++ b/src/nvim/po/CMakeLists.txt
-@@ -72,8 +72,8 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
- 
-     install_helper(
-       FILES ${moFile}
--      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/lang/${name}/LC_MESSAGES
--      RENAME nvim.mo)
-+      DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${name}/LC_MESSAGES
-+      RENAME ${PROJECT_NAME}.mo)
- 
-     list(APPEND LANGUAGE_MO_FILES ${moFile})
-   endmacro()
-diff --git a/src/nvim/vim.h b/src/nvim/vim.h
-index 762d349..545b903 100644
---- a/src/nvim/vim.h
-+++ b/src/nvim/vim.h
-@@ -27,12 +27,6 @@ Error: configure did not run properly.Check auto/config.log.
- # endif
- #endif
- 
--
--/* Can't use "PACKAGE" here, conflicts with a Perl include file. */
--#ifndef VIMPACKAGE
--# define VIMPACKAGE     "nvim"
--#endif
--
- #include "nvim/os/os_defs.h"       /* bring lots of system header files */
- 
- /// length of a buffer to store a number in ASCII (64 bits binary + NUL)