From 9377245d5392dad653f8d9b4421c2c9dbe407cfc Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 2 Aug 2023 14:46:59 +0200 Subject: [PATCH] Update to version 0.4.3; Fixes RHBZ#2174607 --- .gitignore | 1 + README.md | 3 -- rust-termbg.spec | 39 ++++++++++--------- sources | 2 +- ...data.diff => termbg-fix-metadata-auto.diff | 9 ++--- 5 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 README.md rename termbg-fix-metadata.diff => termbg-fix-metadata-auto.diff (60%) diff --git a/.gitignore b/.gitignore index 656cd55..fa003cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /termbg-0.3.0.crate /termbg-0.4.0.crate /termbg-0.4.1.crate +/termbg-0.4.3.crate diff --git a/README.md b/README.md deleted file mode 100644 index 80756bb..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-termbg - -The rust-termbg package diff --git a/rust-termbg.spec b/rust-termbg.spec index b443834..fef5f88 100644 --- a/rust-termbg.spec +++ b/rust-termbg.spec @@ -1,24 +1,20 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 24 %bcond_without check %global crate termbg -Name: rust-%{crate} -Version: 0.4.1 +Name: rust-termbg +Version: 0.4.3 Release: %autorelease Summary: Terminal background color detection -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/termbg Source: %{crates_source} -# Initial patched metadata -# * drop windows-specific dependencies -Patch0: termbg-fix-metadata.diff +# Automatically generated patch to strip foreign dependencies +Patch: termbg-fix-metadata-auto.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging >= 21 +BuildRequires: rust-packaging >= 23 %global _description %{expand: Terminal background color detection.} @@ -27,18 +23,23 @@ Terminal background color detection.} %package -n %{crate} Summary: %{summary} -# ASL 2.0 or MIT -# BSD +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-3-Clause # MIT -# MIT or ASL 2.0 -# Unlicense or MIT -License: MIT and BSD +# MIT OR Apache-2.0 +# Unlicense OR MIT +License: BSD-3-Clause AND MIT AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Unlicense OR MIT) +# LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} %files -n %{crate} -%license LICENSE-APACHE LICENSE-MIT -%doc CHANGELOG.md README.md +%license LICENSE-APACHE +%license LICENSE-MIT +%license LICENSE.dependencies +%doc CHANGELOG.md +%doc README.md %{_bindir}/termbg %package devel @@ -78,6 +79,8 @@ use the "default" feature of the "%{crate}" crate. %build %cargo_build +%cargo_license_summary +%{cargo_license} > LICENSE.dependencies %install %cargo_install diff --git a/sources b/sources index 93a99f6..310481c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (termbg-0.4.1.crate) = b8f4404766061765798262ccd8d86dfae04d1b111ca8511983dab8d5bff762324febf5cd938d34d1356ffd6107beeeb2b895907b855c19548d9a260848ccda27 +SHA512 (termbg-0.4.3.crate) = 2f9e346a46c1b9da161cff22e042b105284c568523b94c13552dd85f07e576b28c7232d15e8a1efc84b2e77713c2e78192a807748e26b391e2ba137924a2f557 diff --git a/termbg-fix-metadata.diff b/termbg-fix-metadata-auto.diff similarity index 60% rename from termbg-fix-metadata.diff rename to termbg-fix-metadata-auto.diff index c6dac59..1d46949 100644 --- a/termbg-fix-metadata.diff +++ b/termbg-fix-metadata-auto.diff @@ -1,10 +1,9 @@ ---- termbg-0.4.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ termbg-0.4.1/Cargo.toml 2022-07-16T14:30:55.500703+00:00 -@@ -66,12 +66,3 @@ - +--- termbg-0.4.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ termbg-0.4.3/Cargo.toml 2023-08-02T12:44:42.275331+00:00 +@@ -66,11 +66,3 @@ [dependencies.thiserror] version = "1" -- + -[target."cfg(target_os = \"windows\")".dependencies.winapi] -version = "0.3" -features = [