From 559b5176b397f316d27d95f61bc3b09446f75ad0 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Jan 17 2020 15:29:41 +0000
Subject: Correct the license


Since the built executable includes bundled libraries, we need to
set the License field such that it reflects the bundled libraries'
licenses as well. I used cargo-license to do this, and here is the
report it generated:

$ 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

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>

---

diff --git a/rust-askalono-cli.spec b/rust-askalono-cli.spec
index 35f73c4..14f6cb3 100644
--- a/rust-askalono-cli.spec
+++ b/rust-askalono-cli.spec
@@ -6,12 +6,13 @@
 
 Name:           rust-%{crate}
 Version:        0.3.0
-Release:        3%{?dist}
+Release:        4%{?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 can be used to determine this set of licenses
+License:        ASL 2.0 and (ASL 2.0 and BSD or MIT) 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
@@ -54,6 +55,9 @@ Summary:        %{summary}
 %endif
 
 %changelog
+* Fri Jan 17 2020 Randy Barlow <bowlofeggs@fedoraproject.org> - 0.3.0-4
+- Correct the license to reflect the bundled libraries' licenses.
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild