From 109d909b314c99cd78a6da0bbb5a3e2b73fc7722 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mar 05 2022 20:15:35 +0000 Subject: Update to version 1.1.3; Fixes RHBZ#2060082 --- diff --git a/.gitignore b/.gitignore index 274dc30..d1789fd 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /termcolor-1.1.0.crate /termcolor-1.1.1.crate /termcolor-1.1.2.crate +/termcolor-1.1.3.crate diff --git a/rust-termcolor.spec b/rust-termcolor.spec index a5bfda4..7e695de 100644 --- a/rust-termcolor.spec +++ b/rust-termcolor.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 19 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate termcolor Name: rust-%{crate} -Version: 1.1.2 +Version: 1.1.3 Release: %autorelease Summary: Simple cross platform library for writing colored text to a terminal @@ -14,15 +14,12 @@ License: Unlicense or MIT URL: https://crates.io/crates/termcolor Source: %{crates_source} # Initial patched metadata -# * No windows +# * drop Windows-specific dependencies Patch0: termcolor-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Simple cross platform library for writing colored text to a terminal.} @@ -36,12 +33,14 @@ BuildArch: noarch %description devel %{_description} This package contains library source intended for building other packages which -use "%{crate}" crate. +use the "%{crate}" crate. %files devel -%license COPYING LICENSE-MIT UNLICENSE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/COPYING +%license %{crate_instdir}/LICENSE-MIT +%license %{crate_instdir}/UNLICENSE +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,10 +49,10 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} This package contains library source intended for building other packages which -use "the default" feature of the "%{crate}" crate. +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index e884f95..5b17e40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (termcolor-1.1.2.crate) = f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c +SHA512 (termcolor-1.1.3.crate) = 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a diff --git a/termcolor-fix-metadata.diff b/termcolor-fix-metadata.diff index db758a1..ca9710f 100644 --- a/termcolor-fix-metadata.diff +++ b/termcolor-fix-metadata.diff @@ -1,10 +1,9 @@ ---- termcolor-1.1.2/Cargo.toml 2020-11-19T13:21:55+00:00 -+++ termcolor-1.1.2/Cargo.toml 2020-11-19T22:15:50.940502+00:00 -@@ -27,7 +27,3 @@ +--- termcolor-1.1.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ termcolor-1.1.3/Cargo.toml 2022-03-05T20:13:51.938496+00:00 +@@ -38,6 +38,3 @@ [lib] name = "termcolor" bench = false - --[dev-dependencies] -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.3"