From 2f281a530b585354681471de81245840f8049161 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Jan 20 2020 20:24:54 +0000 Subject: Update to 0.4.2 Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index 9ac35a2..b9386e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /askalono-0.3.0.crate +/askalono-0.4.0.crate +/askalono-0.4.2.crate diff --git a/askalono-fix-metadata.diff b/askalono-fix-metadata.diff index 999c880..d999ed4 100644 --- a/askalono-fix-metadata.diff +++ b/askalono-fix-metadata.diff @@ -1,20 +1,11 @@ ---- askalono-0.3.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ askalono-0.3.0/Cargo.toml 2019-07-21T08:21:28.660537+00:00 -@@ -33,7 +33,7 @@ - version = "0.4.1" - - [dependencies.regex] --version = "0.2.10" -+version = "1.1.2" +--- askalono-0.4.2/Cargo.toml 2020-01-14T22:13:47+00:00 ++++ askalono-0.4.2/Cargo.toml 2020-01-20T16:27:56.036081+00:00 +@@ -37,7 +37,7 @@ + version = "1.1.7" [dependencies.rmp-serde] - version = "0.13.7" -@@ -51,7 +51,7 @@ - [dependencies.unicode-normalization] - version = "0.1.5" - [dev-dependencies.env_logger] --version = "0.5.5" -+version = "0.6.1" +-version = "0.13.7" ++version = "0.14.0" - [features] - default = ["spdx"] + [dependencies.serde] + version = "1.0.92" diff --git a/rust-askalono.spec b/rust-askalono.spec index d727c6a..94683c0 100644 --- a/rust-askalono.spec +++ b/rust-askalono.spec @@ -1,26 +1,20 @@ -# Generated by rust2rpm 10 +# Generated by rust2rpm 13 %bcond_without check %global debug_package %{nil} %global crate askalono Name: rust-%{crate} -Version: 0.3.0 -Release: 4%{?dist} +Version: 0.4.2 +Release: 1%{?dist} Summary: Library to detect the contents of license files # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: https://crates.io/crates/askalono Source: %{crates_source} -# To enable full tests: -# git clone https://github.com/amzn/askalono && cd askalono -# git submodule update --init -# tar -czf rust-askalono-0.3.0-datasets.tgz datasets/ -# Source1: rust-askalono-0.3.0-datasets.tgz # Initial patched metadata -# * Bump regex to 1.1.2, env_logger to 0.6.1 -# https://github.com/amzn/askalono/commit/e5875f9676fa4a3e43adcf1dae705ef3f508a4a6 +# - Bump rmp-serde to 0.14.0: https://github.com/amzn/askalono/pull/50 Patch0: askalono-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -45,9 +39,9 @@ This package contains library source intended for building other packages which use "%{crate}" crate. %files devel -%doc CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md NOTICE README.md +%doc NOTICE README.md %license LICENSE -%{cargo_registry}/%{crate}-%{version}/ +%{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel Summary: %{summary} @@ -59,7 +53,7 @@ This package contains library source intended for building other packages which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+serde_json-devel Summary: %{summary} @@ -71,7 +65,7 @@ This package contains library source intended for building other packages which use "serde_json" feature of "%{crate}" crate. %files -n %{name}+serde_json-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+spdx-devel Summary: %{summary} @@ -83,7 +77,7 @@ This package contains library source intended for building other packages which use "spdx" feature of "%{crate}" crate. %files -n %{name}+spdx-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -100,11 +94,16 @@ which use "spdx" feature of "%{crate}" crate. %if %{with check} %check -# The complete tests suite needs the dataset submodule -%cargo_test -- -- --skip self_apache_header --skip real_world_licenses --skip empty_match --skip self_licenses --skip store_loads +%cargo_test %endif %changelog +* Mon Jan 20 17:26:04 CET 2020 Robert-André Mauchin - 0.4.2-1 +- Update to 0.4.2 + +* Fri Dec 06 01:04:40 CET 2019 Robert-André Mauchin - 0.4.0-1 +- Release 0.4.0 + * Fri Jul 26 2019 Fedora Release Engineering - 0.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 3ac986a..16a3e2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (askalono-0.3.0.crate) = 46c8d201ac2c299900ee6f3bb32ad2eda8c45da0bc33ec46db5f0d64f954d8d2250c60157733dbe96233752924f6e261662fa83f247ee0321d23792da074b24a +SHA512 (askalono-0.4.2.crate) = dfca63203d6c9465834006450a1943b5686df2222a4d0675dcab227846f10e60e9cf3ba0f3f4204abea4b9c5b5b91052b85324012494b9e96fe65bd24025f95c