Accepting request 639612 from home:mcepl

- Switch used to LuaJIT and run SPEC file through spec-cleaner.

Also, it requires lua51-bit32 package to be in Factory. There is https://build.opensuse.org/request/show/639588 for it.

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

neovim.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  2 12:26:23 UTC 2018 - Matěj Cepl <mcepl@suse.com>
+
+- Switch used to LuaJIT and run SPEC file through spec-cleaner.
+
 -------------------------------------------------------------------
 Sat Aug 25 20:15:52 UTC 2018 - mcepl@suse.com
 

neovim.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -22,7 +22,7 @@ Release:        0
 Summary:        Vim-fork focused on extensibility and agility
 License:        Apache-2.0 AND Vim
 Group:          Productivity/Text/Editors
-Url:            https://neovim.io/
+URL:            https://neovim.io/
 Source0:        https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        sysinit.vim
 Source2:        spec-template
@@ -37,23 +37,17 @@ Patch2:         neovim-0.2.0-gcc-prototype.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  cmake
-BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  filesystem
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  git-core
 BuildRequires:  gperf
-BuildRequires:  hicolor-icon-theme
-BuildRequires:  libmsgpack-devel >= 1.2.0
-BuildRequires:  libmsgpackc-devel >= 1.2.0
 BuildRequires:  libtool
-# BuildRequires:  lua53-devel
-BuildRequires:  lua53-lpeg
-BuildRequires:  lua53-luarocks
-BuildRequires:  lua53-mpack
-BuildRequires:  luajit-devel
+BuildRequires:  make
+BuildRequires:  msgpack-devel
 BuildRequires:  pkgconfig
+BuildRequires:  unzip
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(jemalloc)
 BuildRequires:  pkgconfig(libnsl)
@@ -61,11 +55,20 @@ BuildRequires:  pkgconfig(libuv)
 BuildRequires:  pkgconfig(termkey) >= 0.20
 BuildRequires:  pkgconfig(unibilium)
 BuildRequires:  pkgconfig(vterm)
-%requires_eq libtermkey1
-Recommends:     %{name}-lang
-Recommends:     python-neovim
-Recommends:     python3-neovim
+Requires:       gperf
+BuildRequires:  lua51-LPeg
+BuildRequires:  lua51-bit32
+BuildRequires:  lua51-luajit-devel
+BuildRequires:  lua51-luarocks
+BuildRequires:  lua51-mpack
 Recommends:     xsel
+Requires(post):    desktop-file-utils
+Requires(postun):  desktop-file-utils
+%if 0%{?suse_version} < 1330
+BuildRequires:  hicolor-icon-theme
+Requires(post):    gtk3-tools
+Requires(postun):  gtk3-tools
+%endif
 
 %description
 Neovim is a refactor - and sometimes redactor - in the tradition of
@@ -80,7 +83,10 @@ parts of Vim, without compromise, and more.
 %lang_package
 
 %prep
-%autosetup -p1
+%setup -q -n %{name}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 # Remove __DATE__ and __TIME__.
 BUILD_TIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{H}:%{M}')
@@ -93,7 +99,6 @@ sed -i "s/__DATE__/\"$BUILD_DATE\"/" $(grep -rl '__DATE__')
 HOSTNAME=OBS
 USERNAME=OBS
 %cmake \
-  -DLUA_PRG=%{_bindir}/lua \
   -DUSE_BUNDLED=OFF        \
   -DLUAJIT_USE_BUNDLED=OFF \
   -DENABLE_JEMALLOC=ON
@@ -117,13 +122,17 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/nvim/template.spec
 %fdupes %{buildroot}%{_datadir}/
 %find_lang nvim
 
+%if 0%{?suse_version} < 1330
 %post
 %desktop_database_post
 %icon_theme_cache_post
+%endif
 
+%if 0%{?suse_version} < 1330
 %postun
 %desktop_database_postun
 %icon_theme_cache_postun
+%endif
 
 %files
 %doc BACKERS.md CONTRIBUTING.md README.md