up to 0.17.0

[packages/delta.git] / delta.spec

diff --git a/delta.spec b/delta.spec
index b56129c04ea36d6ad51e9a9825aa679e63ec1791..9c0de5cd71be90809e96f5b6793cfe0a4feda5ed 100644 (file)
--- a/delta.spec
+++ b/delta.spec
@@ -1,27 +1,34 @@
-%define                crates_ver      0.8.3
+#
+# 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.8.3
-Release:       3
+Version:       0.17.0
+Release:       1
 License:       MIT
 Group:         Applications
 Source0:       https://github.com/dandavison/delta/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 2d5b4c862b8231a826ac016d505c7bb5
-# ./create-crates.sh
+# Source0-md5: 323ef94cc3d9c0b21691ecc5e250708f
 Source1:       %{name}-crates-%{crates_ver}.tar.xz
-# Source1-md5: f2fcdc51f618201bbd02eefa6bb57a19
+# Source1-md5: c32b2651ccef34736929edaca477a269
 URL:           https://github.com/dandavison/delta
 BuildRequires: cargo
-BuildRequires: libgit2-devel >= 1.1.0
-BuildRequires: oniguruma-devel >= 6.9.3
+%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
-Requires:      libgit2 >= 1.1.0
-Requires:      oniguruma >= 6.9.3
+%{?with_system_libgit2:Requires:       libgit2 >= 1.7.2}
+Requires:      oniguruma >= 6.9.8
 ExclusiveArch: %{rust_arches}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -79,6 +86,7 @@ export RUSTONIG_SYSTEM_LIBONIG=true
 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*