X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=delta.spec;h=aff9b42328ca66219bd4c4ad148b60657eb99fa1;hb=5e51bdb81cdff13bd82f2ef3e2b295405e840b92;hp=4d99ac7b9db42977d649656af8b3a9cc314138a0;hpb=80f5ed9b096d344c2f1ac72423521c0247c150fe;p=packages%2Fdelta.git

diff --git a/delta.spec b/delta.spec
index 4d99ac7..aff9b42 100644
--- a/delta.spec
+++ b/delta.spec
@@ -1,20 +1,28 @@
+%define		crates_ver	0.10.0
+
 Summary:	A viewer for git and diff output
 Name:		delta
-Version:	0.4.1
+Version:	0.11.0
 Release:	1
 License:	MIT
 Group:		Applications
 Source0:	https://github.com/dandavison/delta/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	a5a4a0e8b8ba90690a4b090d1e80d0aa
-# cd delta-%{version}
-# cargo vendor
-# cd ..
-# tar cJf delta-crates-%{version}.tar.xz delta-%{version}/{vendor,Cargo.lock}
-Source1:	%{name}-crates-%{version}.tar.xz
-# Source1-md5:	1ee73ff0fc14b1139f3626b7cb4c4bcc
+# Source0-md5:	ecdb9a2fb0bc6a6fa0acd8e9b22fd756
+# ./create-crates.sh
+Source1:	%{name}-crates-%{crates_ver}.tar.xz
+# Source1-md5:	498c47b0832644df022c6ed9f7c3814d
 URL:		https://github.com/dandavison/delta
 BuildRequires:	cargo
+BuildRequires:	libgit2-devel >= 1.1.0
+BuildRequires:	oniguruma-devel >= 6.9.3
+BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 2.004
 BuildRequires:	rust
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Requires:	libgit2 >= 1.1.0
+Requires:	oniguruma >= 6.9.3
+ExclusiveArch:	%{rust_arches}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,7 +51,10 @@ Delta's main features are:
   diff output.
 
 %prep
-%setup -q -b1
+%setup -q -a1
+
+%{__mv} delta-%{crates_ver}/* .
+sed -i -e 's/@@VERSION@@/%{version}/' Cargo.lock
 
 # use our offline registry
 export CARGO_HOME="$(pwd)/.cargo"
@@ -60,14 +71,15 @@ EOF
 
 %build
 export CARGO_HOME="$(pwd)/.cargo"
+export RUSTONIG_SYSTEM_LIBONIG=true
 
-cargo -v build --release --frozen
+%cargo_build --frozen
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export CARGO_HOME="$(pwd)/.cargo"
 
-cargo -v install --frozen --root $RPM_BUILD_ROOT%{_prefix} --path $PWD
+%cargo_install --frozen --root $RPM_BUILD_ROOT%{_prefix} --path $PWD
 %{__rm} $RPM_BUILD_ROOT%{_prefix}/.crates*
 
 %clean