From 13624573c1c9366a1e4af8cd8c776156d93d44d1 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 25 Nov 2022 15:13:41 +0100
Subject: [PATCH] Update to version 0.25.0; Fixes RHBZ#1970468

---
 .gitignore                       |  1 +
 crossterm-fix-metadata-auto.diff | 15 +++++++++++
 crossterm-fix-metadata.diff      | 12 ---------
 rust-crossterm.spec              | 43 +++++++++++++++++++-------------
 sources                          |  2 +-
 5 files changed, 43 insertions(+), 30 deletions(-)
 create mode 100644 crossterm-fix-metadata-auto.diff
 delete mode 100644 crossterm-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index 89ebe32..6977189 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /crossterm-0.19.0.crate
 /crossterm-0.20.0.crate
 /crossterm-0.22.1.crate
+/crossterm-0.25.0.crate
diff --git a/crossterm-fix-metadata-auto.diff b/crossterm-fix-metadata-auto.diff
new file mode 100644
index 0000000..a289d3d
--- /dev/null
+++ b/crossterm-fix-metadata-auto.diff
@@ -0,0 +1,15 @@
+--- crossterm-0.25.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ crossterm-0.25.0/Cargo.toml	1970-01-01T00:00:01+00:00
+@@ -106,12 +106,3 @@
+ version = "0.2.3"
+ features = ["support-v0_8"]
+ 
+-[target."cfg(windows)".dependencies.crossterm_winapi]
+-version = "0.9"
+-
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.9"
+-features = [
+-    "winuser",
+-    "winerror",
+-]
diff --git a/crossterm-fix-metadata.diff b/crossterm-fix-metadata.diff
deleted file mode 100644
index a86a1ee..0000000
--- a/crossterm-fix-metadata.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- crossterm-0.22.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ crossterm-0.22.1/Cargo.toml	2022-02-13T11:47:33.053433+00:00
-@@ -84,9 +84,3 @@
- [target."cfg(unix)".dependencies.signal-hook-mio]
- version = "0.2.1"
- features = ["support-v0_7"]
--[target."cfg(windows)".dependencies.crossterm_winapi]
--version = "0.9"
--
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.9"
--features = ["winuser"]
diff --git a/rust-crossterm.spec b/rust-crossterm.spec
index 57f7f75..b235f01 100644
--- a/rust-crossterm.spec
+++ b/rust-crossterm.spec
@@ -1,25 +1,21 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 23
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate crossterm
 
-Name:           rust-%{crate}
-Version:        0.22.1
+Name:           rust-crossterm
+Version:        0.25.0
 Release:        %autorelease
 Summary:        Crossplatform terminal library for manipulating terminals
 
-# Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/crossterm
 Source:         %{crates_source}
-# Initial patched metadata
-# * drop windows-specific dependencies
-Patch0:         crossterm-fix-metadata.diff
+# Automatically generated patch to strip foreign dependencies
+Patch:          crossterm-fix-metadata-auto.diff
 
-ExclusiveArch:  %{rust_arches}
-
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Crossplatform terminal library for manipulating terminals.}
@@ -36,9 +32,10 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.
 
 %files          devel
-%license LICENSE
-%doc CHANGELOG.md README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE
+%doc %{crate_instdir}/CHANGELOG.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -50,7 +47,19 @@ 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
+
+%package     -n %{name}+bracketed-paste-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+bracketed-paste-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "bracketed-paste" feature of the "%{crate}" crate.
+
+%files       -n %{name}+bracketed-paste-devel
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+event-stream-devel
 Summary:        %{summary}
@@ -62,7 +71,7 @@ This package contains library source intended for building other packages which
 use the "event-stream" feature of the "%{crate}" crate.
 
 %files       -n %{name}+event-stream-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+futures-core-devel
 Summary:        %{summary}
@@ -74,7 +83,7 @@ This package contains library source intended for building other packages which
 use the "futures-core" feature of the "%{crate}" crate.
 
 %files       -n %{name}+futures-core-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+serde-devel
 Summary:        %{summary}
@@ -86,7 +95,7 @@ This package contains library source intended for building other packages which
 use the "serde" feature of the "%{crate}" crate.
 
 %files       -n %{name}+serde-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 f62aa8a..aaf4a97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (crossterm-0.22.1.crate) = 2a8534a12bb119be583d491b3595259d164de6922ce2a17bbe6f19fcff93339a6d0d8c08398958a7592d6aa765eb2ebc6e61b54211080785357c711b2c454d91
+SHA512 (crossterm-0.25.0.crate) = fdf2b5b4bdcbc8c7dc4e8c5e0cdf68cacdb97886b52087dde1f1be9b869c00965c0cf9db64b700801b0d1274b913703ade66a92d47aa8da604121693b8701201