From 58574e82d0e14840fc3a20630d7515f00a5d67cc Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: May 31 2017 11:37:20 +0000
Subject: Merge branch 'master' into f25


---

diff --git a/neovim-0.2.0-gcc-prototype.patch b/neovim-0.2.0-gcc-prototype.patch
new file mode 100644
index 0000000..4d4fc81
--- /dev/null
+++ b/neovim-0.2.0-gcc-prototype.patch
@@ -0,0 +1,38 @@
+diff -up neovim-0.2.0/src/nvim/ex_cmds.c.than neovim-0.2.0/src/nvim/ex_cmds.c
+--- neovim-0.2.0/src/nvim/ex_cmds.c.than	2017-05-31 10:58:05.669558647 +0200
++++ neovim-0.2.0/src/nvim/ex_cmds.c	2017-05-31 11:03:07.759568456 +0200
+@@ -103,6 +103,8 @@ typedef kvec_t(MatchedLine) MatchedLineV
+ # include "ex_cmds.c.generated.h"
+ #endif
+ 
++bool do_sub_msg(bool count_only);
++
+ /*
+  * ":ascii" and "ga".
+  */
+diff -up neovim-0.2.0/src/nvim/normal.c.than neovim-0.2.0/src/nvim/normal.c
+--- neovim-0.2.0/src/nvim/normal.c.than	2017-05-31 11:04:39.969572665 +0200
++++ neovim-0.2.0/src/nvim/normal.c	2017-05-31 11:09:43.669582843 +0200
+@@ -61,6 +61,22 @@
+ #include "nvim/os/time.h"
+ #include "nvim/os/input.h"
+ 
++bool
++find_decl (
++    char_u *ptr,
++    size_t len,
++    bool locally,
++    bool thisblock,
++    int flags_arg
++);
++
++bool
++get_visual_text (
++    cmdarg_T *cap,
++    char_u **pp,
++    size_t *lenp
++);
++
+ typedef struct normal_state {
+   VimState state;
+   linenr_T conceal_old_cursor_line;
diff --git a/neovim.spec b/neovim.spec
index c079f8a..9fe9417 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -1,6 +1,6 @@
 Name:           neovim
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 
 License:        ASL 2.0
 Summary:        Vim-fork focused on extensibility and agility
@@ -10,6 +10,8 @@ Source0:        https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{v
 Source1:        sysinit.vim
 Source2:        spec-template
 Patch0:         neovim-0.1.7-bitop.patch
+# fix build issue on ppc64
+Patch1:         neovim-0.2.0-gcc-prototype.patch
 
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -26,10 +28,15 @@ BuildRequires:  libtermkey-devel
 BuildRequires:  libuv-devel
 BuildRequires:  libvterm-devel
 BuildRequires:  unibilium-devel
+%if 0%{?el7}
+BuildRequires:  lua-bit32
+Requires:       lua-bit32
+%else
 Recommends:     python2-neovim
 Recommends:     python3-neovim
 # XSel provides access to the system clipboard
 Recommends:     xsel
+%endif
 
 %description
 Neovim is a refactor - and sometimes redactor - in the tradition of
@@ -42,9 +49,7 @@ excisions, Neovim is Vim. It is built for users who want the good
 parts of Vim, without compromise, and more.
 
 %prep
-%setup -q
-
-%patch0 -p1 -b .neovim-0.1.7-bitop.patch
+%autosetup -p1
 
 %build
 mkdir -p build
@@ -1456,9 +1461,18 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png
 %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor
 
 %changelog
+* Wed May 31 2017 Than Ngo <than@redhat.com> 0.2.0-3
+- fixed bz#1451143, ppc64/le build failure
+
+* Mon May 15 2017 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.2.0-2
+- Adjust spec for building on epel7
+
 * Mon May 08 2017 Andreas Schneider <asn@redhat.com> - 0.2.0-1
 - resolves: #1447481 - Update to 0.2.0
 
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Thu Dec 29 2016 Filip Szymański <fszymanski at, fedoraproject.org> - 0.1.7-6
 - Add RPM spec file template