From cdf12c0a542a44b5e02966ae4a6943f2c36d6ff2 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sun, 6 Aug 2023 15:04:27 +0200
Subject: [PATCH] Regenerate with rust2rpm v24

---
 async-std-fix-metadata-auto.diff | 42 +++++++++++++++++++++++++++++++
 async-std-fix-metadata.diff      | 43 +++-----------------------------
 rust-async-std.spec              | 28 ++++++---------------
 3 files changed, 53 insertions(+), 60 deletions(-)
 create mode 100644 async-std-fix-metadata-auto.diff

diff --git a/async-std-fix-metadata-auto.diff b/async-std-fix-metadata-auto.diff
new file mode 100644
index 0000000..d0e02c8
--- /dev/null
+++ b/async-std-fix-metadata-auto.diff
@@ -0,0 +1,42 @@
+--- async-std-1.12.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ async-std-1.12.0/Cargo.toml	2023-08-06T13:00:23.061570+00:00
+@@ -142,7 +142,6 @@
+     "kv-log-macro",
+     "log",
+     "pin-project-lite",
+-    "gloo-timers",
+ ]
+ docs = [
+     "attributes",
+@@ -158,8 +157,6 @@
+     "once_cell",
+     "pin-utils",
+     "slab",
+-    "wasm-bindgen-futures",
+-    "futures-channel",
+     "async-channel",
+     "async-lock",
+ ]
+@@ -189,22 +186,3 @@
+ version = "1.0.0"
+ optional = true
+ 
+-[target."cfg(target_arch = \"wasm32\")".dependencies.futures-channel]
+-version = "0.3.4"
+-optional = true
+-
+-[target."cfg(target_arch = \"wasm32\")".dependencies.gloo-timers]
+-version = "0.2.1"
+-features = ["futures"]
+-optional = true
+-
+-[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen-futures]
+-version = "0.4.10"
+-optional = true
+-
+-[target."cfg(target_arch = \"wasm32\")".dev-dependencies.getrandom]
+-version = "0.2.0"
+-features = ["js"]
+-
+-[target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
+-version = "0.3.10"
diff --git a/async-std-fix-metadata.diff b/async-std-fix-metadata.diff
index 5cdc3fd..c43f8e4 100644
--- a/async-std-fix-metadata.diff
+++ b/async-std-fix-metadata.diff
@@ -1,5 +1,5 @@
 --- async-std-1.12.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ async-std-1.12.0/Cargo.toml	2022-07-16T10:34:51.714357+00:00
++++ async-std-1.12.0/Cargo.toml	2023-08-06T13:01:27.146892+00:00
 @@ -46,10 +46,6 @@
  [[example]]
  name = "tcp-ipv4-and-6-echo"
@@ -22,49 +22,12 @@
  [dev-dependencies.femme]
  version = "2.1.1"
  
-@@ -142,7 +134,6 @@
-     "kv-log-macro",
-     "log",
-     "pin-project-lite",
--    "gloo-timers",
- ]
- docs = [
-     "attributes",
-@@ -158,13 +149,10 @@
-     "once_cell",
-     "pin-utils",
-     "slab",
--    "wasm-bindgen-futures",
--    "futures-channel",
+@@ -160,8 +152,6 @@
      "async-channel",
      "async-lock",
  ]
- tokio02 = ["async-global-executor/tokio02"]
+-tokio02 = ["async-global-executor/tokio02"]
 -tokio03 = ["async-global-executor/tokio03"]
  tokio1 = ["async-global-executor/tokio"]
  unstable = [
      "std",
-@@ -188,23 +176,3 @@
- [target."cfg(not(target_os = \"unknown\"))".dependencies.futures-lite]
- version = "1.0.0"
- optional = true
--
--[target."cfg(target_arch = \"wasm32\")".dependencies.futures-channel]
--version = "0.3.4"
--optional = true
--
--[target."cfg(target_arch = \"wasm32\")".dependencies.gloo-timers]
--version = "0.2.1"
--features = ["futures"]
--optional = true
--
--[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen-futures]
--version = "0.4.10"
--optional = true
--
--[target."cfg(target_arch = \"wasm32\")".dev-dependencies.getrandom]
--version = "0.2.0"
--features = ["js"]
--
--[target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
--version = "0.3.10"
diff --git a/rust-async-std.spec b/rust-async-std.spec
index e757275..3dd6179 100644
--- a/rust-async-std.spec
+++ b/rust-async-std.spec
@@ -1,26 +1,26 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 24
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate async-std
 
-Name:           rust-%{crate}
+Name:           rust-async-std
 Version:        1.12.0
 Release:        %autorelease
 Summary:        Async version of the Rust standard library
 
 # Upstream license specification: Apache-2.0/MIT
-License:        ASL 2.0 or MIT
+License:        Apache-2.0 OR MIT
 URL:            https://crates.io/crates/async-std
 Source:         %{crates_source}
-# Initial patched metadata
+# Automatically generated patch to strip foreign dependencies
+Patch:          async-std-fix-metadata-auto.diff
+# Manually created patch for downstream crate metadata changes
 # * drop windows-specific dependencies and features
 # * drop WASM-specific dependencies and features
-# * drop tokio 0.3 features
+# * drop tokio v0.2 and v0.3 features
 # * drop optional surf dependency
-Patch0:         async-std-fix-metadata.diff
-
-ExclusiveArch:  %{rust_arches}
+Patch:          async-std-fix-metadata.diff
 
 BuildRequires:  rust-packaging >= 21
 
@@ -310,18 +310,6 @@ use the "std" feature of the "%{crate}" crate.
 %files       -n %{name}+std-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+tokio02-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+tokio02-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "tokio02" feature of the "%{crate}" crate.
-
-%files       -n %{name}+tokio02-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+tokio1-devel
 Summary:        %{summary}
 BuildArch:      noarch