diff --git a/.gitignore b/.gitignore index 716f104..299caeb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /askalono-cli-0.3.0.crate +/askalono-cli-0.4.2.crate diff --git a/askalono-cli-fix-metadata.diff b/askalono-cli-fix-metadata.diff deleted file mode 100644 index 830d67b..0000000 --- a/askalono-cli-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- askalono-cli-0.3.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ askalono-cli-0.3.0/Cargo.toml 2019-07-21T08:18:57.557770+00:00 -@@ -34,7 +34,7 @@ - optional = true - - [dependencies.env_logger] --version = "0.5.5" -+version = "0.6.1" - - [dependencies.failure] - version = "0.1.1" diff --git a/rust-askalono-cli.spec b/rust-askalono-cli.spec index 35f73c4..f979b24 100644 --- a/rust-askalono-cli.spec +++ b/rust-askalono-cli.spec @@ -1,22 +1,30 @@ -# Generated by rust2rpm 10 +# Generated by rust2rpm 13 %bcond_without check %global __cargo_skip_build 0 %global crate askalono-cli Name: rust-%{crate} -Version: 0.3.0 -Release: 3%{?dist} +Version: 0.4.2 +Release: 1%{?dist} Summary: Tool to detect the contents of license files -# Upstream license specification: Apache-2.0 -# https://github.com/amzn/askalono/issues/38 -License: ASL 2.0 +# cargo-license: +# Apache-2.0 (1): askalono +# Apache-2.0 AND BSD-2-Clause OR MIT (1): crossbeam-queue +# Apache-2.0 OR BSL-1.0 (1): ryu +# Apache-2.0 OR MIT (48): either, num-traits, backtrace-sys, rayon, crossbeam-epoch, cfg-if, +# winapi-i686-pc-windows-gnu, backtrace, unicode-xid, serde_json, failure, env_logger, quote, +# itoa, zstd-sys, rayon-core, unicode-normalization, cc, libc, num_cpus, autocfg, rustc-demangle, +# regex, hermit-abi, semver-parser, lazy_static, serde, autocfg, serde_derive, crossbeam-utils, +# log, smallvec, thread_local, jobserver, regex-syntax, quick-error, crossbeam-deque, winapi- +# x86_64-pc-windows-gnu, scopeguard, syn, semver, humantime, glob, winapi, rustc_version, +# proc-macro2, zstd-safe, failure_derive +# MIT (6): zstd, rmp-serde, atty, rmp, synstructure, memoffset +# MIT OR Unlicense (5): winapi-util, termcolor, aho-corasick, byteorder, memchr +License: ASL 2.0 and (ASL 2.0 or MIT and BSD) and (ASL 2.0 or Boost) and (ASL 2.0 or MIT) and MIT and (MIT or Unlicense) URL: https://crates.io/crates/askalono-cli Source: %{crates_source} -# Initial patched metadata -# * Update env_logger to 0.6.1, https://github.com/amzn/askalono/commit/e5875f9676fa4a3e43adcf1dae705ef3f508a4a6 -Patch0: askalono-cli-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -33,6 +41,8 @@ Summary: %{summary} %description -n %{crate} %{_description} %files -n %{crate} +%license LICENSE +%doc NOTICE README.md %{_bindir}/askalono %prep @@ -54,6 +64,10 @@ Summary: %{summary} %endif %changelog +* Mon Jan 20 21:52:47 CET 2020 Robert-André Mauchin - 0.4.2-1 +- Update to 0.4.2 +- Fix license to include all statically linked libraries + * Fri Jul 26 2019 Fedora Release Engineering - 0.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 8685e44..80c2c63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (askalono-cli-0.3.0.crate) = 418f61d4520da5a4d77e245a927865f57b919822599f67617b5432d9e74df02bce44f01bdedede0ea4ef343969e6e2e52a11aa6ff269f46364182db5a85d1545 +SHA512 (askalono-cli-0.4.2.crate) = e2014a5361c43dbd251641268227d0de90d13ccf34f4cfb4fcc050517fd787076a412a8b4e1e6a428d121d5955b6274c1550797ce52f4cbc71d3dc2d04937956