From da70ef87924e496affa5576cff4e471978d0667d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 30 Jan 2024 13:31:26 +0100 Subject: [PATCH] Update to version 0.1.8; Fixes RHBZ#2259502 --- .gitignore | 1 + rust-weezl.spec | 16 +++++++++++----- rust2rpm.toml | 4 ++++ sources | 2 +- weezl-fix-metadata.diff | 22 ++++++++++++++++------ 5 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 rust2rpm.toml diff --git a/.gitignore b/.gitignore index 5ebbee6..54e9588 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /weezl-0.1.4.crate /weezl-0.1.5.crate /weezl-0.1.7.crate +/weezl-0.1.8.crate diff --git a/rust-weezl.spec b/rust-weezl.spec index f44b967..41752fb 100644 --- a/rust-weezl.spec +++ b/rust-weezl.spec @@ -1,10 +1,10 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global crate weezl Name: rust-weezl -Version: 0.1.7 +Version: 0.1.8 Release: %autorelease Summary: Fast LZW compression and decompression @@ -12,10 +12,10 @@ License: MIT OR Apache-2.0 URL: https://crates.io/crates/weezl Source: %{crates_source} # Manually created patch for downstream crate metadata changes -# * drop unused, benchmark-only criterion dev-dependency to speed up builds +# * drop unused, benchmark-only criterion dev-dependency Patch: weezl-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Fast LZW compression and decompression.} @@ -24,12 +24,16 @@ Fast LZW compression and decompression.} %package -n %{crate} Summary: %{summary} +# MIT OR Apache-2.0 +License: MIT OR Apache-2.0 +# LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} %files -n %{crate} %license LICENSE-APACHE %license LICENSE-MIT +%license LICENSE.dependencies %doc Changes.md %doc README.md %{_bindir}/lzw @@ -111,7 +115,7 @@ use the "std" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires @@ -119,6 +123,8 @@ use the "std" feature of the "%{crate}" crate. %build %cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies %install %cargo_install diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..21c43f6 --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,4 @@ +[tests] +run = ["doc"] +comments = ["files needed for encode/decode tests are not included in published crates"] + diff --git a/sources b/sources index c1ade5e..def6649 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weezl-0.1.7.crate) = 3fd8cb01dde494371df57001c97be90418b642ba88b0945cd98f973a4498743b83d383bcdfc8884db1da75271aeef4ce3b418e425f23690f12a5cc645c418e90 +SHA512 (weezl-0.1.8.crate) = 6012de47d6bb5177820be9794e70ce6354577247750b8a125dad1d3e093d96cacba62471d8f67f056a72447bb6bf7fffabc6254ae96d93014a5200c71d571c97 diff --git a/weezl-fix-metadata.diff b/weezl-fix-metadata.diff index 609cbab..db9a4bc 100644 --- a/weezl-fix-metadata.diff +++ b/weezl-fix-metadata.diff @@ -1,12 +1,22 @@ ---- weezl-0.1.7/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ weezl-0.1.7/Cargo.toml 2023-08-07T18:44:09.114344+00:00 -@@ -72,9 +72,6 @@ +--- weezl-0.1.8/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ weezl-0.1.8/Cargo.toml 2024-01-30T12:29:00.622493+00:00 +@@ -61,19 +61,11 @@ + name = "implicit_reset" + required-features = ["std"] + +-[[bench]] +-name = "msb8" +-harness = false +-required-features = ["std"] +- + [dependencies.futures] + version = "0.3.12" + features = ["std"] optional = true default-features = false - +- -[dev-dependencies.criterion] -version = "0.3.1" -- + [dev-dependencies.tokio] version = "1" - features = [