From 85a801d1179466635228b79e0379fafdf1eaac60 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 1 Apr 2023 18:33:18 +0200 Subject: [PATCH] Update to version 2.0.0; Fixes RHBZ#2183739 --- .gitignore | 1 + README.md | 3 --- rust-supports-color.spec | 18 +++++++----------- sources | 2 +- ...orts-color-1.3.0-disable-failed-tests.patch | 14 -------------- 5 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 README.md delete mode 100644 supports-color-1.3.0-disable-failed-tests.patch diff --git a/.gitignore b/.gitignore index 41104a0..567573a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /supports-color-1.3.0.crate +/supports-color-2.0.0.crate diff --git a/README.md b/README.md deleted file mode 100644 index 261f49b..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-supports-color - -The rust-supports-color package diff --git a/rust-supports-color.spec b/rust-supports-color.spec index 4f67fa2..64be5a2 100644 --- a/rust-supports-color.spec +++ b/rust-supports-color.spec @@ -1,22 +1,17 @@ -# Generated by rust2rpm 21 -%bcond_with check +# Generated by rust2rpm 24 +%bcond_without check %global debug_package %{nil} %global crate supports-color -Name: rust-%{crate} -Version: 1.3.0 +Name: rust-supports-color +Version: 2.0.0 Release: %autorelease Summary: Detects whether a terminal supports color, and gives details about that support -# Upstream license specification: Apache-2.0 -License: ASL 2.0 +License: Apache-2.0 URL: https://crates.io/crates/supports-color Source: %{crates_source} -# Disable failed tests for now -Patch: %{crate}-1.3.0-disable-failed-tests.patch - -ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging >= 21 @@ -68,7 +63,8 @@ use the "default" feature of the "%{crate}" crate. %if %{with check} %check -%cargo_test +# * skip tests that only work on real TTYs +%cargo_test -- -- --skip tests::test_clicolor_ansi --skip tests::test_empty_env %endif %changelog diff --git a/sources b/sources index 5073fca..0881663 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (supports-color-1.3.0.crate) = 3e77067b24e90bf06758a59f5b480c085956b80390c3a1db786de2fd251dc7c737b8e869c88b0a8605fcbc471f1db262890929b009a02398fa059ffbbd946657 +SHA512 (supports-color-2.0.0.crate) = eaf4100f7f3974617de525572cc815e76e7033c39ede7b6de11b1305b4eed8de955416f0064707306cefacf0615cce9066d3c838d6ceefa9f4d311c7cf2cde89 diff --git a/supports-color-1.3.0-disable-failed-tests.patch b/supports-color-1.3.0-disable-failed-tests.patch deleted file mode 100644 index abe8577..0000000 --- a/supports-color-1.3.0-disable-failed-tests.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff '--color=auto' -ruN supports-color-1.3.0/src/lib.rs supports-color-1.3.0-disable-failed-tests/src/lib.rs ---- supports-color-1.3.0/src/lib.rs 1973-11-29 13:33:09.000000000 -0800 -+++ supports-color-1.3.0-disable-failed-tests/src/lib.rs 2022-04-01 11:34:01.143138693 -0700 -@@ -200,8 +200,8 @@ - }); - assert_eq!(on(atty::Stream::Stdout), expected); - -- std::env::set_var("CLICOLOR", "0"); -- assert_eq!(on(atty::Stream::Stdout), None); -+ // std::env::set_var("CLICOLOR", "0"); -+ // assert_eq!(on(atty::Stream::Stdout), None); - } - - #[test]