From b55aaa720ffb0f1febdd93d379b006885ac3e705 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 18 May 2023 16:58:40 +0200
Subject: [PATCH] Regenerate with rust2rpm v24

---
 README.md                      |  3 ---
 rust-termion.spec              | 46 ++++++++++++++++------------------
 termion-fix-metadata-auto.diff | 11 ++++++++
 termion-fix-metadata.diff      |  9 ++-----
 4 files changed, 34 insertions(+), 35 deletions(-)
 delete mode 100644 README.md
 create mode 100644 termion-fix-metadata-auto.diff

diff --git a/README.md b/README.md
deleted file mode 100644
index 0cf2ca5..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-termion
-
-The rust-termion package
\ No newline at end of file
diff --git a/rust-termion.spec b/rust-termion.spec
index 96c4806..9c1eebc 100644
--- a/rust-termion.spec
+++ b/rust-termion.spec
@@ -1,35 +1,31 @@
-# Generated by rust2rpm 16
-# * Tests rely on tty
+# Generated by rust2rpm 24
+# * tests can only be run on a real TTY
 %bcond_with check
 %global debug_package %{nil}
 
 %global crate termion
 
-Name:           rust-%{crate}
+Name:           rust-termion
 Version:        1.5.6
 Release:        %autorelease
 Summary:        Bindless library for manipulating terminals
 
-# Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/termion
 Source:         %{crates_source}
-# Initial patched metadata
-# * No redox
-# * Update numtoa to 0.2.3
-Patch0:         termion-fix-metadata.diff
-# https://gitlab.redox-os.org/redox-os/termion/merge_requests/153/diffs?commit_id=8c3378e1ff06c40fcd694ddfac93ebb8c272164b
-Patch1:         0001-Update-numtoa.patch
-
-ExclusiveArch:  %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif
+# Automatically generated patch to strip foreign dependencies
+Patch:          termion-fix-metadata-auto.diff
+# Manually created patch for downstream crate metadata changes
+# * bump numtoa from 0.1 to 0.2.3
+Patch:          termion-fix-metadata.diff
+# * port to numtoa 0.2:
+#   https://gitlab.redox-os.org/redox-os/termion/merge_requests/153
+Patch:          0001-Update-numtoa.patch
 
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
-Bindless library for manipulating terminals.}
+A bindless library for manipulating terminals.}
 
 %description %{_description}
 
@@ -39,13 +35,13 @@ BuildArch:      noarch
 
 %description    devel %{_description}
 
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
 
 %files          devel
-%license LICENSE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -53,11 +49,11 @@ BuildArch:      noarch
 
 %description -n %{name}+default-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+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/termion-fix-metadata-auto.diff b/termion-fix-metadata-auto.diff
new file mode 100644
index 0000000..a4f2197
--- /dev/null
+++ b/termion-fix-metadata-auto.diff
@@ -0,0 +1,11 @@
+--- termion-1.5.6/Cargo.toml	1970-01-01T00:00:00+00:00
++++ termion-1.5.6/Cargo.toml	2023-05-18T14:57:45.292786+00:00
+@@ -25,8 +25,3 @@
+ features = ["std"]
+ [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.redox_termios]
+-version = "0.1"
diff --git a/termion-fix-metadata.diff b/termion-fix-metadata.diff
index 9055173..c4d656e 100644
--- a/termion-fix-metadata.diff
+++ b/termion-fix-metadata.diff
@@ -1,6 +1,6 @@
 --- termion-1.5.6/Cargo.toml	1970-01-01T00:00:00+00:00
-+++ termion-1.5.6/Cargo.toml	2021-03-26T10:04:49.078281+00:00
-@@ -21,12 +21,6 @@
++++ termion-1.5.6/Cargo.toml	2023-05-18T14:57:50.801811+00:00
+@@ -21,7 +21,6 @@
  license = "MIT"
  repository = "https://gitlab.redox-os.org/redox-os/termion"
  [dependencies.numtoa]
@@ -9,8 +9,3 @@
 +version = "0.2.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.redox_termios]
--version = "0.1"