diff --git a/askalono-fix-metadata.diff b/askalono-fix-metadata.diff index 0e55959..3036611 100644 --- a/askalono-fix-metadata.diff +++ b/askalono-fix-metadata.diff @@ -1,11 +1,11 @@ ---- askalono-0.3.0/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ askalono-0.3.0/Cargo.toml 2019-03-28T09:18:15.912109+01:00 +--- askalono-0.3.0/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ askalono-0.3.0/Cargo.toml 2019-07-21T08:11:05.247249+00:00 @@ -33,7 +33,7 @@ version = "0.4.1" - + [dependencies.regex] -version = "0.2.10" +version = "1" - + [dependencies.rmp-serde] version = "0.13.7" diff --git a/rust-askalono.spec b/rust-askalono.spec index 9f1bb28..cef4ab9 100644 --- a/rust-askalono.spec +++ b/rust-askalono.spec @@ -1,12 +1,12 @@ -# Generated by rust2rpm -%bcond_with check +# Generated by rust2rpm 10 +%bcond_without check %global debug_package %{nil} %global crate askalono Name: rust-%{crate} Version: 0.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to detect the contents of license files # Upstream license specification: Apache-2.0 @@ -23,25 +23,14 @@ Source: %{crates_source} Patch0: askalono-fix-metadata.diff ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -BuildRequires: (crate(failure/default) >= 0.1.1 with crate(failure/default) < 0.2.0) -BuildRequires: (crate(flate2/default) >= 1.0.1 with crate(flate2/default) < 2.0.0) -BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0) -BuildRequires: (crate(log/default) >= 0.4.1 with crate(log/default) < 0.5.0) -BuildRequires: (crate(rayon/default) >= 1.0.1 with crate(rayon/default) < 2.0.0) -BuildRequires: (crate(regex/default) >= 1.0.0 with crate(regex/default) < 2.0.0) -BuildRequires: (crate(rmp-serde/default) >= 0.13.7 with crate(rmp-serde/default) < 0.14.0) -BuildRequires: (crate(serde/default) >= 1.0.33 with crate(serde/default) < 2.0.0) -BuildRequires: (crate(serde_derive/default) >= 1.0.33 with crate(serde_derive/default) < 2.0.0) -BuildRequires: (crate(serde_json/default) >= 1.0.11 with crate(serde_json/default) < 2.0.0) -BuildRequires: (crate(unicode-normalization/default) >= 0.1.5 with crate(unicode-normalization/default) < 0.2.0) -%if %{with check} -BuildRequires: (crate(env_logger/default) >= 0.5.5 with crate(env_logger/default) < 0.6.0) -%endif -%global _description \ -A library to detect the contents of license files. +%global _description %{expand: +Library to detect the contents of license files.} %description %{_description} @@ -99,6 +88,9 @@ which use "spdx" feature of "%{crate}" crate. %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep +%generate_buildrequires +%cargo_generate_buildrequires + %build %cargo_build @@ -108,10 +100,13 @@ which use "spdx" feature of "%{crate}" crate. %if %{with check} %check # The complete tests suite needs the dataset submodule -%cargo_test ||: +%cargo_test -- -- --skip self_apache_header,real_world_licenses,empty_match,self_licenses,store_loads %endif %changelog +* Sun Jul 21 10:11:05 CEST 2019 Igor Gnatenko - 0.3.0-3 +- Regenerate + * Thu Apr 11 14:40:21 CEST 2019 Igor Gnatenko - 0.3.0-2 - Run tests in infrastructure