Hello community,
here is the log from the commit of package neovim for openSUSE:Factory checked
in at 2019-09-23 12:29:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/neovim (Old)
and /work/SRC/openSUSE:Factory/.neovim.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "neovim"
Mon Sep 23 12:29:14 2019 rev:25 rq:731915 version:0.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/neovim/neovim.changes 2019-07-08
16:33:13.324284727 +0200
+++ /work/SRC/openSUSE:Factory/.neovim.new.7948/neovim.changes 2019-09-23
12:29:15.777690429 +0200
@@ -1,0 +2,16 @@
+Thu Sep 19 12:25:08 CEST 2019 - Matej Cepl <mc...@suse.com>
+
+- Update to version 0.4.2. There is toooooo many changes to list
+ it there. Also fixes boo#1151203.
+- Reapplied patches:
+ - neovim-0.1.7-bitop.patch
+ - neovim-0.2.0-gcc-prototype.patch
+ - neovim.patch
+
+-------------------------------------------------------------------
+Thu Sep 19 07:02:32 UTC 2019 - Martin Liška <mli...@suse.cz>
+
+- Remove neovim-0.2.0-gcc-prototype.patch patch.
+- Add run-time dependency to lua51-luv.
+
+-------------------------------------------------------------------
Old:
----
neovim-0.2.0-gcc-prototype.patch
neovim-0.3.8.tar.gz
New:
----
neovim-0.4.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ neovim.spec ++++++
--- /var/tmp/diff_new_pack.GQVzy9/_old 2019-09-23 12:29:16.633690289 +0200
+++ /var/tmp/diff_new_pack.GQVzy9/_new 2019-09-23 12:29:16.633690289 +0200
@@ -17,7 +17,7 @@
Name: neovim
-Version: 0.3.8
+Version: 0.4.2
Release: 0
Summary: Vim-fork focused on extensibility and agility
License: Apache-2.0 AND Vim
@@ -32,38 +32,48 @@
Patch0: neovim.patch
# PATCH-FIX-OPENSUSE neovim-0.1.7-bitop.patch mc...@cepl.eu build with old Lua
with external bit module
Patch1: neovim-0.1.7-bitop.patch
-# fix build issue on ppc64
-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: libnsl-devel
+BuildRequires: libtermkey-devel
BuildRequires: libtool
+BuildRequires: libuv-devel
+BuildRequires: libvterm-devel >= 0.1
+BuildRequires: lua-macros
BuildRequires: lua51-LPeg
BuildRequires: lua51-bit32
BuildRequires: lua51-luajit-devel
BuildRequires: lua51-luarocks
+BuildRequires: lua51-luv-devel
BuildRequires: lua51-mpack
BuildRequires: make
BuildRequires: msgpack-devel
BuildRequires: pkgconfig
+BuildRequires: python-rpm-macros
+BuildRequires: unibilium-devel
BuildRequires: unzip
BuildRequires: update-desktop-files
-BuildRequires: pkgconfig(jemalloc)
-BuildRequires: pkgconfig(libnsl)
-BuildRequires: pkgconfig(libuv)
-BuildRequires: pkgconfig(termkey) >= 0.20
-BuildRequires: pkgconfig(unibilium)
-BuildRequires: pkgconfig(vterm)
Requires: gperf
+Requires: libvterm0 >= 0.1
+Requires: lua51-bit32
+Requires: lua51-luv
+Requires: python3-neovim
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Recommends: xsel
+# gh#neovim/neovim#7879
+%ifarch aarch64 ppc64
+BuildRequires: lua51-devel
+%else
+BuildRequires: lua51-luajit-devel
+%endif
%if 0%{?suse_version} < 1330
BuildRequires: hicolor-icon-theme
Requires(post): gtk3-tools
@@ -88,7 +98,6 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
# Remove __DATE__ and __TIME__.
BUILD_TIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{H}:%{M}')
@@ -100,12 +109,22 @@
# set vars to make build reproducible in spite of config/CMakeLists.txt
HOSTNAME=OBS
USERNAME=OBS
-%cmake \
- -DUSE_BUNDLED=OFF \
- -DLUAJIT_USE_BUNDLED=OFF \
- -DENABLE_JEMALLOC=ON \
- -Wno-dev
-%make_jobs
+mkdir -p build
+pushd build
+%{__cmake} .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%ifarch aarch64 ppc64
+ -DPREFER_LUA=ON \
+%endif
+ -DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DUSE_BUNDLED=OFF -DLUAJIT_USE_BUNDLED=OFF \
+ -DCMAKE_COLOR_MAKEFILE=OFF \
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$opts" \
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+ -DLIBLUV_LIBRARY=%{lua_archdir}/luv.so \
+ -DLIBLUV_INCLUDE_DIR:PATH=%{lua_incdir}
+make %{?_smp_mflags} VERBOSE=1
+
+popd
%install
%cmake_install
@@ -128,6 +147,10 @@
%fdupes %{buildroot}%{_datadir}/
%find_lang nvim
+# We have to have rpath
+# https://en.opensuse.org/openSUSE:Packaging_checks
+export NO_BRP_CHECK_RPATH=true
+
%if 0%{?suse_version} < 1330
%post
%desktop_database_post
++++++ neovim-0.1.7-bitop.patch ++++++
--- /var/tmp/diff_new_pack.GQVzy9/_old 2019-09-23 12:29:16.653690285 +0200
+++ /var/tmp/diff_new_pack.GQVzy9/_new 2019-09-23 12:29:16.653690285 +0200
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -477,7 +477,7 @@ endforeach()
+@@ -483,7 +483,7 @@ endforeach()
# Find Lua interpreter
include(LuaHelpers)
++++++ neovim-0.3.8.tar.gz -> neovim-0.4.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/neovim/neovim-0.3.8.tar.gz
/work/SRC/openSUSE:Factory/.neovim.new.7948/neovim-0.4.2.tar.gz differ: char
12, line 1
++++++ neovim.patch ++++++
--- /var/tmp/diff_new_pack.GQVzy9/_old 2019-09-23 12:29:16.685690280 +0200
+++ /var/tmp/diff_new_pack.GQVzy9/_new 2019-09-23 12:29:16.689690280 +0200
@@ -1,6 +1,6 @@
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
-@@ -66,7 +66,9 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILI
+@@ -75,7 +75,9 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILI
BuildLuarocks(
CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/luarocks/configure
--prefix=${HOSTDEPS_INSTALL_DIR} --force-config ${LUAROCKS_OPTS}
