up to 0.17.0

[packages/delta.git] / delta.spec

diff --git a/delta.spec b/delta.spec
index 61c5ce26be417726c682c84057835f476a16fd19..9c0de5cd71be90809e96f5b6793cfe0a4feda5ed 100644 (file)
--- a/delta.spec
+++ b/delta.spec
@@ -1,22 +1,35 @@
-%define                crates_ver      0.7.1
+#
+# Conditional build:
+%bcond_without system_libgit2          # use system installed libgit2
+
+%define                crates_ver      0.17.0
 
 Summary:       A viewer for git and diff output
 Name:          delta
-Version:       0.7.1
-Release:       2
+Version:       0.17.0
+Release:       1
 License:       MIT
 Group:         Applications
 Source0:       https://github.com/dandavison/delta/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a606fdeaf7c689aba27da79b13362f89
-# ./create-crates.sh
+# Source0-md5: 323ef94cc3d9c0b21691ecc5e250708f
 Source1:       %{name}-crates-%{crates_ver}.tar.xz
-# Source1-md5: 88f9be8b3bf03d2651690a010cc27766
+# Source1-md5: c32b2651ccef34736929edaca477a269
 URL:           https://github.com/dandavison/delta
 BuildRequires: cargo
-BuildRequires: rpmbuild(macros) >= 2.003
+%if %{with system_libgit2}
+BuildRequires: libgit2-devel < 1.8.0
+BuildRequires: libgit2-devel >= 1.7.2
+%endif
+BuildRequires: oniguruma-devel >= 6.9.8
+BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 2.004
 BuildRequires: rust
+BuildRequires: rust-bindgen
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
+%{?with_system_libgit2:Requires:       libgit2 >= 1.7.2}
+Requires:      oniguruma >= 6.9.8
+ExclusiveArch: %{rust_arches}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -65,6 +78,7 @@ EOF
 
 %build
 export CARGO_HOME="$(pwd)/.cargo"
+export RUSTONIG_SYSTEM_LIBONIG=true
 
 %cargo_build --frozen
 
@@ -72,6 +86,7 @@ export CARGO_HOME="$(pwd)/.cargo"
 rm -rf $RPM_BUILD_ROOT
 export CARGO_HOME="$(pwd)/.cargo"
 
+export RUSTONIG_SYSTEM_LIBONIG=true
 %cargo_install --frozen --root $RPM_BUILD_ROOT%{_prefix} --path $PWD
 %{__rm} $RPM_BUILD_ROOT%{_prefix}/.crates*