[packages/neovim] builds with bundled deps

[glen]

commit ccead67132f16621c26eb3a72b96a7e85acc0434
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Sep 14 23:26:29 2016 +0300

    builds with bundled deps

 neovim.spec | 53 ++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 13 deletions(-)
---
diff --git a/neovim.spec b/neovim.spec
index d9e27f6..d31c4f8 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -1,37 +1,48 @@
 # 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.2
 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:	msgpack-devel >= 1.2.0
+BuildRequires:	pkgconfig
+#BuildRequires:	pkgconfig(vterm)
+BuildRequires:	rpmbuild(macros) >= 1.596
+BuildRequires:	unibilium-devel
+%if %{with lua}
 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)
 
+%define		_prefix	/usr/local
+
 %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,18 +56,33 @@ 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
+%if 0
 %cmake \
 	-DLUA_PRG=%{_bindir}/lua \
 	-DUSE_BUNDLED=OFF		\
 	-DLUAJIT_USE_BUNDLED=OFF \
-	-DENABLE_JEMALLOC=ON
+	-DENABLE_JEMALLOC=ON \
+\
+	-DUSE_BUNDLED_JEMALLOC=ON \
+	-DUSE_BUNDLED_UNIBILIUM=ON \
+	-DUSE_BUNDLED_LIBTERMKEY=ON \
+	-DUSE_BUNDLED_LIBVTERM=ON \
+	-DUSE_BUNDLED_LIBUV=ON \
+	-DUSE_BUNDLED_MSGPACK=ON \
+	-DUSE_BUNDLED_LUAJIT=ON \
+	-DUSE_BUNDLED_LUAROCKS=ON \
+	-DUSE_BUNDLED_LUV=ON \
+
+%endif
 
 %{__make}
 
@@ -65,8 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} 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 +102,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_desktop_database
-%icon_theme_cache_post
+%update_icon_cache hicolor
 
 %postun
 %update_desktop_database
-%icon_theme_cache_postun
+%update_icon_cache hicolor
 
 %files -f nvim.lang
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/neovim.git/commitdiff/ccead67132f16621c26eb3a72b96a7e85acc0434