Update dirs to 2

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2019-07-14 18:30:23 +02:00
parent 871e68b9d7
commit 1a340b5c52
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C
2 changed files with 24 additions and 31 deletions

View File

@ -1,5 +1,14 @@
--- bat-0.11.0/Cargo.toml 1970-01-01T00:00:00+00:00
+++ bat-0.11.0/Cargo.toml 2019-06-07T18:37:04.306758+00:00
+++ bat-0.11.0/Cargo.toml 2019-07-14T16:28:37.896509+00:00
@@ -44,7 +44,7 @@
version = "0.2.4"
[dependencies.dirs]
-version = "1.0"
+version = "2.0"
[dependencies.encoding]
version = "0.2"
@@ -55,7 +55,7 @@
default-features = false

View File

@ -1,12 +1,13 @@
# Generated by rust2rpm-9-1.fc30
# Generated by rust2rpm 10
# * assert_cmd is not packaged
%bcond_with check
%global __cargo_skip_build 0
%global crate bat
Name: rust-%{crate}
Version: 0.11.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: cat(1) clone with wings
# Upstream license specification: MIT/Apache-2.0
@ -15,39 +16,15 @@ URL: https://crates.io/crates/bat
Source: %{crates_source}
# Initial patched metadata
# * Bump git2 to 0.9, https://github.com/sharkdp/bat/pull/580
# * Bump dirs to 2.0, https://github.com/sharkdp/bat/pull/572
Patch0: bat-fix-metadata.diff
ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging
BuildRequires: (crate(ansi_colours/default) >= 1.0.0 with crate(ansi_colours/default) < 2.0.0)
BuildRequires: (crate(ansi_term/default) >= 0.11.0 with crate(ansi_term/default) < 0.12.0)
BuildRequires: (crate(atty/default) >= 0.2.2 with crate(atty/default) < 0.3.0)
BuildRequires: (crate(clap/color) >= 2.33.0 with crate(clap/color) < 3.0.0)
BuildRequires: (crate(clap/default) >= 2.33.0 with crate(clap/default) < 3.0.0)
BuildRequires: (crate(clap/suggestions) >= 2.33.0 with crate(clap/suggestions) < 3.0.0)
BuildRequires: (crate(clap/wrap_help) >= 2.33.0 with crate(clap/wrap_help) < 3.0.0)
BuildRequires: (crate(console/default) >= 0.7.0 with crate(console/default) < 0.8.0)
BuildRequires: (crate(content_inspector/default) >= 0.2.4 with crate(content_inspector/default) < 0.3.0)
BuildRequires: (crate(dirs/default) >= 1.0.0 with crate(dirs/default) < 2.0.0)
BuildRequires: (crate(encoding/default) >= 0.2.0 with crate(encoding/default) < 0.3.0)
BuildRequires: (crate(error-chain) >= 0.12.0 with crate(error-chain) < 0.13.0)
BuildRequires: (crate(git2) >= 0.9.0 with crate(git2) < 0.10.0)
BuildRequires: (crate(lazy_static/default) >= 1.3.0 with crate(lazy_static/default) < 2.0.0)
BuildRequires: (crate(shell-words/default) >= 0.1.0 with crate(shell-words/default) < 0.2.0)
BuildRequires: (crate(syntect/dump-create) >= 3.2.0 with crate(syntect/dump-create) < 4.0.0)
BuildRequires: (crate(syntect/dump-load) >= 3.2.0 with crate(syntect/dump-load) < 4.0.0)
BuildRequires: (crate(syntect/parsing) >= 3.2.0 with crate(syntect/parsing) < 4.0.0)
BuildRequires: (crate(syntect/yaml-load) >= 3.2.0 with crate(syntect/yaml-load) < 4.0.0)
BuildRequires: (crate(wild/default) >= 2.0.0 with crate(wild/default) < 3.0.0)
%if %{with check}
BuildRequires: (crate(assert_cmd/default) >= 0.11.1 with crate(assert_cmd/default) < 0.12.0)
BuildRequires: (crate(escargot/default) >= 0.5.0 with crate(escargot/default) < 0.6.0)
BuildRequires: (crate(tempdir/default) >= 0.3.0 with crate(tempdir/default) < 0.4.0)
%endif
%global _description \
A cat(1) clone with wings.
%global _description %{expand:
Cat(1) clone with wings.}
%description %{_description}
@ -66,12 +43,16 @@ Summary: %{summary}
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
%generate_buildrequires
%cargo_generate_buildrequires
%build
%cargo_build
%install
%cargo_install
%{__install} -Dpm0644 -t %{buildroot}%{_mandir}/man1 doc/bat.1
install -Dpm0644 -t %{buildroot}%{_mandir}/man1 \
doc/bat.1
%if %{with check}
%check
@ -79,6 +60,9 @@ Summary: %{summary}
%endif
%changelog
* Sun Jul 14 18:28:38 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.11.0-3
- Update dirs to 2.0
* Fri Jun 07 2019 Josh Stone <jistone@redhat.com> - 0.11.0-2
- Bump git2 to 0.9