From 64f77920d69008aff4892fe9050e150dd32d2b31 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 10 Nov 2023 00:53:25 +0100 Subject: [PATCH] Update to version 2.0.3; Fixes RHBZ#2247936 --- .gitignore | 1 + rust-termion.spec | 10 +++++----- sources | 2 +- termion-fix-metadata-auto.diff | 10 +++++----- termion-fix-metadata.diff | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 6ded30f..3f641d5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /termion-1.5.5.crate /termion-1.5.6.crate /termion-2.0.1.crate +/termion-2.0.3.crate diff --git a/rust-termion.spec b/rust-termion.spec index 1b8fca3..fd9e297 100644 --- a/rust-termion.spec +++ b/rust-termion.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 # * tests can only be run on a real TTY %bcond_with check %global debug_package %{nil} @@ -6,14 +6,14 @@ %global crate termion Name: rust-termion -Version: 2.0.1 +Version: 2.0.3 Release: %autorelease Summary: Bindless library for manipulating terminals License: MIT URL: https://crates.io/crates/termion Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: termion-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes # * bump numtoa from 0.1 to 0.2.3 @@ -22,7 +22,7 @@ Patch: termion-fix-metadata.diff # https://gitlab.redox-os.org/redox-os/termion/merge_requests/153 Patch: 0001-Update-numtoa.patch -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: A bindless library for manipulating terminals.} @@ -68,7 +68,7 @@ use the "serde" 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 diff --git a/sources b/sources index e685f79..a63eac6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (termion-2.0.1.crate) = 4e46fe6ad0e3e3047796253e5064f044f9feb34f9341d478a0548ef32e46a7a6c0fe86ec0ae2e8b700d5b3ac85d0ccb8aec63064ba40cadfcc8714a5a10225df +SHA512 (termion-2.0.3.crate) = 39073d7108b03293b4bd0053333947d224287a332d32c6829a7df4bfefeff0fc8ac977a35a2dc4673f3bdd3c91b055d710b0ca95247d5d664cccc184e43e9c81 diff --git a/termion-fix-metadata-auto.diff b/termion-fix-metadata-auto.diff index ef2b1fd..d2ffa25 100644 --- a/termion-fix-metadata-auto.diff +++ b/termion-fix-metadata-auto.diff @@ -1,11 +1,11 @@ ---- termion-2.0.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ termion-2.0.1/Cargo.toml 2023-05-22T15:54:14.371169+00:00 +--- termion-2.0.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ termion-2.0.3/Cargo.toml 2023-11-09T23:49:33.845288+00:00 @@ -49,8 +49,3 @@ [target."cfg(not(target_os = \"redox\"))".dependencies.libc] version = "0.2" --[target."cfg(target_os = \"redox\")".dependencies.redox_syscall] --version = "0.2" +-[target."cfg(target_os = \"redox\")".dependencies.libredox] +-version = "0.0.2" - -[target."cfg(target_os = \"redox\")".dependencies.redox_termios] --version = "0.1" +-version = "0.1.3" diff --git a/termion-fix-metadata.diff b/termion-fix-metadata.diff index 48ff348..b508847 100644 --- a/termion-fix-metadata.diff +++ b/termion-fix-metadata.diff @@ -1,5 +1,5 @@ ---- termion-2.0.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ termion-2.0.1/Cargo.toml 2023-05-22T15:54:20.499216+00:00 +--- termion-2.0.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ termion-2.0.3/Cargo.toml 2023-11-09T23:49:39.132308+00:00 @@ -38,8 +38,7 @@ repository = "https://gitlab.redox-os.org/redox-os/termion"