- add Lua support

diff --git a/vim-lua.patch b/vim-lua.patch
new file mode 100644 (file)
index 0000000..94dc354
--- /dev/null
+++ b/vim-lua.patch
@@ -0,0 +1,12 @@
+diff -ruN vim-7.4.979.orig/src/configure.in vim-7.4.979/src/configure.in
+--- vim-7.4.979.orig/src/configure.in  2015-12-19 15:28:18.000000000 +0100
++++ vim-7.4.979/src/configure.in       2016-01-05 01:33:07.501230977 +0100
+@@ -535,7 +535,7 @@
+       fi
+     else
+       dnl -- try to find Lua executable
+-      AC_PATH_PROG(vi_cv_path_plain_lua, lua)
++      AC_PATH_PROG(vi_cv_path_plain_lua, lua5.2)
+       if test "X$vi_cv_path_plain_lua" != "X"; then
+       dnl -- find Lua version
+       AC_CACHE_CHECK(Lua version, vi_cv_version_plain_lua,

diff --git a/vim.spec b/vim.spec
index 2dff81299e7fc9a7c9cca91985ce958e64f93384..3c0813a9a9112fc6fb7b097cc07f79b2d812cbae 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -8,6 +8,7 @@
 %bcond_without heavy           # don't build heavy (full-featured GNOME-based gvim/vim)
 %bcond_without gui             # don't build any GUI
 %bcond_without light           # don't build light (minimal, ncurses, but not static)
+%bcond_with    lua             # with Lua interp in vim package
 %bcond_with    perl            # with Perl interp in vim package
 %bcond_with    python          # with Python interp in vim package
 %bcond_with    ruby            # with Ruby interp in vim package
@@ -28,7 +29,7 @@
 # VCS Commits: https://github.com/vim/vim/commits/master
 
 %define                ver             7.4.979
-%define                rel             3
+%define                rel             4
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
 Summary(es.UTF-8):     Editor visual incrementado
@@ -106,6 +107,7 @@ Patch37:    %{name}-ft-mysql.patch
 Patch38:       %{name}-ft-gyp.patch
 Patch39:       %{name}-revert-7.4.165-noundo.patch
 Patch40:       desktop.patch
+Patch41:       %{name}-lua.patch
 URL:           http://www.vim.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -124,6 +126,9 @@ BuildRequires:      gtk+2-devel >= 2:2.6.0
 %if %{with selinux} || %{with heavy}
 BuildRequires: libselinux-devel
 %endif
+%if %{with lua} || %{with heavy}
+BuildRequires: lua52-devel
+%endif
 %{?with_motif:BuildRequires:   motif-devel}
 BuildRequires: ncurses-devel
 BuildRequires: pkgconfig
@@ -780,6 +785,7 @@ cp -p runtime/gvim.desktop gvim-motif.desktop
 %patch38 -p1
 %patch39 -p1
 %patch40 -p1
+%patch41 -p1
 
 cp -p %{SOURCE20} runtime/syntax
 cp -p %{SOURCE22} runtime/syntax
@@ -824,6 +830,7 @@ build() {
        %{__make} -j1 distclean
        # add common options, can override (disable) if needed with args
        %configure \
+               --%{!?with_lua:dis}%{?with_lua:en}able-luainterp \
                --%{!?with_perl:dis}%{?with_perl:en}able-perlinterp \
                --%{!?with_python:dis}%{?with_python:en}able-pythoninterp \
                --%{!?with_ruby:dis}%{?with_ruby:en}able-rubyinterp \
@@ -852,6 +859,7 @@ build vim.static \
        --disable-gui \
        --without-x \
        --with-features=small \
+       --disable-luainterp \
        --disable-perlinterp \
        --disable-pythoninterp \
        --disable-rubyinterp \
@@ -869,6 +877,7 @@ build vim.light \
        --disable-gui \
        --without-x \
        --with-features=small \
+       --disable-luainterp \
        --disable-perlinterp \
        --disable-pythoninterp \
        --disable-rubyinterp \
@@ -938,6 +947,7 @@ build vim.heavy \
        --with-features=huge \
        --disable-gui \
        --without-x \
+       --enable-luainterp \
        --enable-perlinterp \
        --enable-pythoninterp \
        --enable-rubyinterp \
@@ -950,6 +960,7 @@ build gvim.heavy \
        --enable-gtk2-check \
        --enable-gnome-check \
        --with-x \
+       --enable-luainterp \
        --enable-perlinterp \
        --enable-pythoninterp \
        --enable-rubyinterp \