From 6fe4355d273a25986568f3f0b0c87c2911e900e4 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 14 Oct 2023 22:54:28 +0200 Subject: [PATCH] Update to version 0.6.4; Fixes RHBZ#2241248 --- .gitignore | 1 + anstream-fix-metadata-auto.diff | 10 ++++----- anstream-fix-metadata.diff | 39 +++++++++++++++++++++++---------- rust-anstream.spec | 22 ++++++++++++++----- sources | 2 +- 5 files changed, 52 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 3f585e6..60bec74 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /anstream-0.2.6.crate /anstream-0.3.2.crate /anstream-0.5.0.crate +/anstream-0.6.4.crate diff --git a/anstream-fix-metadata-auto.diff b/anstream-fix-metadata-auto.diff index 4ed7af4..db5190d 100644 --- a/anstream-fix-metadata-auto.diff +++ b/anstream-fix-metadata-auto.diff @@ -1,12 +1,12 @@ ---- anstream-0.5.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ anstream-0.5.0/Cargo.toml 2023-09-19T22:11:48.545424+00:00 -@@ -133,8 +133,5 @@ - "auto", +--- anstream-0.6.4/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ anstream-0.6.4/Cargo.toml 2023-10-14T19:56:45.806444+00:00 +@@ -134,8 +134,5 @@ "wincon", ] + test = [] -wincon = ["dep:anstyle-wincon"] +wincon = [] -[target."cfg(windows)".dependencies.anstyle-wincon] --version = "2.0.0" +-version = "3.0.1" -optional = true diff --git a/anstream-fix-metadata.diff b/anstream-fix-metadata.diff index d3e23c6..1f246ad 100644 --- a/anstream-fix-metadata.diff +++ b/anstream-fix-metadata.diff @@ -1,23 +1,40 @@ ---- anstream-0.5.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ anstream-0.5.0/Cargo.toml 2023-09-19T22:12:14.007540+00:00 -@@ -112,9 +112,6 @@ +--- anstream-0.6.4/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ anstream-0.6.4/Cargo.toml 2023-10-14T19:57:17.102569+00:00 +@@ -83,18 +83,6 @@ + [Unreleased]: https://github.com/rust-cli/anstyle/compare/{{tag_name}}...HEAD""" + search = "" + +-[[bench]] +-name = "strip" +-harness = false +- +-[[bench]] +-name = "wincon" +-harness = false +- +-[[bench]] +-name = "stream" +-harness = false +- + [dependencies.anstyle] + version = "1.0.0" + +@@ -112,9 +100,6 @@ [dependencies.utf8parse] version = "0.2.1" -[dev-dependencies.criterion] --version = "0.4.0" +-version = "0.5.1" - [dev-dependencies.owo-colors] version = "3.5.0" -@@ -129,9 +126,4 @@ - "dep:anstyle-query", - "dep:colorchoice", +@@ -131,8 +116,5 @@ ] --default = [ -- "auto", + default = [ + "auto", - "wincon", --] + ] + test = [] -wincon = [] - -+default = ["auto"] diff --git a/rust-anstream.spec b/rust-anstream.spec index 962d9eb..b98ea61 100644 --- a/rust-anstream.spec +++ b/rust-anstream.spec @@ -1,21 +1,21 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate anstream Name: rust-anstream -Version: 0.5.0 +Version: 0.6.4 Release: %autorelease Summary: Simple cross platform library for writing colored text to a terminal License: MIT OR Apache-2.0 URL: https://crates.io/crates/anstream Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: anstream-fix-metadata-auto.diff # 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 # * drop Windows-specific features Patch: anstream-fix-metadata.diff @@ -65,8 +65,20 @@ use the "auto" feature of the "%{crate}" crate. %files -n %{name}+auto-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+test-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+test-devel %{_description} + +This package contains library source intended for building other packages which +use the "test" feature of the "%{crate}" crate. + +%files -n %{name}+test-devel +%ghost %{crate_instdir}/Cargo.toml + %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires diff --git a/sources b/sources index a346bf1..d18c5cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anstream-0.5.0.crate) = 8e285cc8f92708cf9482e7b4dc84dd891e5ec0bd8c57894c6bb368eede1127b7b903adb4c40b37287e3644535cc60c92662951c2c8fb5b92e10f49ff5374d359 +SHA512 (anstream-0.6.4.crate) = 0b983d626c53d1edc184f04cbd2c004eb9c40d14486b23cce86ebf50cbd3d916d32cb0423ae1d67c2b83b966690090af740538538ef846c0b126c686a1ebe159