X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=neovim.spec;h=692ee11e0fd5088d3e430efce1fa52481dbf6455;hb=a2169a2f3d0113fe2876776d44d2434123738de1;hp=d9e27f678453b0ee92a9c925341803b29330acf9;hpb=0a9d0af1e5cfe7b07c27e9e8d3cda4feb34e8f1d;p=packages%2Fneovim.git

diff --git a/neovim.spec b/neovim.spec
index d9e27f6..692ee11 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -1,37 +1,51 @@
 # TODO
 # - -rt subpackage? -lang subpackage?
+#
+# Conditional build:
+%bcond_with	lua		# LUA
+
 Summary:	Vim-fork focused on extensibility and agility
 Name:		neovim
 Version:	0.1.5
-Release:	0.1
+Release:	0.4
 License:	Apache v2.0
 Group:		Applications/Editors/Vim
 Source0:	https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{version}.tar.gz
 URL:		https://neovim.io/
 Source1:	%{name}.desktop
 Source2:	%{name}.svg
-BuildRequires:	cmake
+BuildRequires:	cmake >= 2.8.7
 BuildRequires:	fdupes
+BuildRequires:	gcc >= 6:4.4
 BuildRequires:	hicolor-icon-theme
 BuildRequires:	jemalloc-devel
-BuildRequires:	libmsgpack-devel >= 1.2.0
-BuildRequires:	libmsgpackc-devel >= 1.2.0
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtermkey-devel
 BuildRequires:	libuv-devel
+BuildRequires:	libvterm-devel
+BuildRequires:	msgpack-devel >= 1.1.0
+BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.596
+BuildRequires:	unibilium-devel
+%if %{with lua}
+BuildRequires:	lua-lpeg
+BuildRequires:	lua-mpack >= 1.0.2
 BuildRequires:	lua51-BitOp
-BuildRequires:	lua51-LPeg
-BuildRequires:	lua51-mpack
 BuildRequires:	luajit-devel
-BuildRequires:	pkgconfig
-BuildRequires:	pkgconfig(termkey)
-BuildRequires:	pkgconfig(unibilium)
-BuildRequires:	pkgconfig(vterm)
-BuildRequires:	update-desktop-files
+%endif
+Requires:	desktop-file-utils
+Requires:	gtk-update-icon-cache
+Requires:	hicolor-icon-theme
 Suggests:	python-neovim
 Suggests:	python3-neovim
 Suggests:	xsel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# gcc 4.0 and better turn on _FORTIFY_SOURCE=2 automatically. This currently
+# does not work with Neovim due to some uses of dynamically-sized structures.
+# See https://github.com/neovim/neovim/issues/223 for details.
+%define		filterout_c	-Wp,-D_FORTIFY_SOURCE=2
+
 %description
 Neovim is a refactor - and sometimes redactor - in the tradition of
 Vim, which itself derives from Stevie. It is not a rewrite, but a
@@ -45,28 +59,54 @@ parts of Vim, without compromise, and more.
 %prep
 %setup -q
 
+%if 0
 # Remove __DATE__ and __TIME__.
 BUILD_TIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{H}:%{M}')
 BUILD_DATE=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{b} %{d} %{Y}')
 sed -i "s/__TIME__/\"$BUILD_TIME\"/" $(grep -rl '__TIME__')
 sed -i "s/__DATE__/\"$BUILD_DATE\"/" $(grep -rl '__DATE__')
+%endif
 
 %build
+install -d .deps build
+cd .deps
 %cmake \
-	-DLUA_PRG=%{_bindir}/lua \
-	-DUSE_BUNDLED=OFF		\
+	-DUSE_BUNDLED=OFF \
+	-DUSE_BUNDLED_JEMALLOC=OFF \
+	-DUSE_BUNDLED_UNIBILIUM=OFF \
+	-DUSE_BUNDLED_LIBTERMKEY=OFF \
+	-DUSE_BUNDLED_LIBVTERM=OFF \
+	-DUSE_BUNDLED_LIBUV=OFF \
+	-DUSE_BUNDLED_MSGPACK=OFF \
+	-DUSE_BUNDLED_LUAJIT=ON \
+	-DUSE_BUNDLED_LUAROCKS=ON \
+	-DUSE_BUNDLED_LUV=ON \
+	../third-party
+%{__make}
+
+cd ../build
+%cmake \
+	-DLUA_PRG=/usr/bin/luajit \
+	-DENABLE_JEMALLOC=ON \
 	-DLUAJIT_USE_BUNDLED=OFF \
-	-DENABLE_JEMALLOC=ON
+	-DLIBUV_USE_BUNDLED=OFF \
+	-DMSGPACK_USE_BUNDLED=OFF \
+	-DUNIBILIUM_USE_BUNDLED=OFF \
+	-DLIBTERMKEY_USE_BUNDLED=OFF \
+	-DLIBVTERM_USE_BUNDLED=OFF \
+	-DJEMALLOC_USE_BUNDLED=OFF \
+	..
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir}/hicolor/scalable/apps}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/neovim.desktop
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/neovim.svg
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/neovim.svg
 
 %find_lang nvim
 
@@ -75,11 +115,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_desktop_database
-%icon_theme_cache_post
+%update_icon_cache hicolor
+%banner -e -o %{name} << 'EOF'
+
+The Neovim executable is called 'nvim'. To use your existing Vim
+configuration:
+    ln -s ~/.vim ~/.config/nvim
+    ln -s ~/.vimrc ~/.config/nvim/init.vim
+See ':help nvim' for more information on Neovim.
+
+If you want support for Python plugins such as YouCompleteMe, you need
+to install a Python module in addition to Neovim itself.
+
+See ':help provider-python' or this page for more information:
+    http://neovim.io/doc/user/provider.html
+
+If you have any questions, have a look at:
+    https://github.com/neovim/neovim/wiki/FAQ.
+EOF
 
 %postun
 %update_desktop_database
-%icon_theme_cache_postun
+%update_icon_cache hicolor
 
 %files -f nvim.lang
 %defattr(644,root,root,755)