From 77998fccd2cc7ef8b87549e629318b52c0ecc1d0 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Tue, 13 Dec 2022 16:25:55 +0100
Subject: [PATCH] Update to version 0.3.25; Fixes RHBZ#2136363

---
 .gitignore                |  1 +
 futures-fix-metadata.diff |  6 +++---
 rust-futures.spec         | 13 ++++++++-----
 sources                   |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0f99e77..66cb606 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /futures-0.3.21.crate
 /futures-0.3.23.crate
 /futures-0.3.24.crate
+/futures-0.3.25.crate
diff --git a/futures-fix-metadata.diff b/futures-fix-metadata.diff
index 83998b7..bb5e249 100644
--- a/futures-fix-metadata.diff
+++ b/futures-fix-metadata.diff
@@ -1,11 +1,11 @@
---- futures-0.3.24/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ futures-0.3.24/Cargo.toml	2022-09-06T10:27:12.716695+00:00
+--- futures-0.3.25/Cargo.toml	1970-01-01T00:00:01+00:00
++++ futures-0.3.25/Cargo.toml	2022-12-13T15:07:05.349190+00:00
 @@ -80,6 +80,9 @@
  [dev-dependencies.assert_matches]
  version = "1.3.0"
  
 +[dev-dependencies.futures-test]
-+version = "=0.3.24"
++version = "=0.3.25"
 +
  [dev-dependencies.pin-project]
  version = "1.0.11"
diff --git a/rust-futures.spec b/rust-futures.spec
index f11cdac..5dabf74 100644
--- a/rust-futures.spec
+++ b/rust-futures.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 23
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate futures
 
 Name:           rust-futures
-Version:        0.3.24
+Version:        0.3.25
 Release:        %autorelease
 Summary:        Implementation of futures and streams
 
@@ -16,8 +16,6 @@ Source:         %{crates_source}
 # * add missing futures-test dev-dependency
 Patch:          futures-fix-metadata.diff
 
-ExclusiveArch:  %{rust_arches}
-
 BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
@@ -200,6 +198,9 @@ use the "write-all-vectored" feature of the "%{crate}" crate.
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
+# * remove a test that doesn't compile with Rust < 1.63:
+#   "use of unstable library feature 'future_poll_fn'"
+rm tests/future_join.rs
 
 %generate_buildrequires
 %cargo_generate_buildrequires -a
@@ -215,7 +216,9 @@ use the "write-all-vectored" feature of the "%{crate}" crate.
 # * always skip a test that is officially "flaky"
 # * skip a possibly flaky test:
 #   https://github.com/rust-lang/futures-rs/issues/2539
-%cargo_test -a -- -- --skip stream_select --skip many_threads
+# * skip a test which fails depending on Rust version:
+#   sizes of some structs and enums changed between Rust 1.62 and 1.63
+%cargo_test -a -- -- --skip stream_select --skip many_threads --skip join_size
 %endif
 
 %changelog
diff --git a/sources b/sources
index f532218..7f9a824 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (futures-0.3.24.crate) = 91f3f1b121923c239b1e3042048fd420a35506b4c1ed6527bcff0fffa8153049a384c4e0b21d59944327552c094db8de8977036c61127b27948979e0da6df949
+SHA512 (futures-0.3.25.crate) = 1b41edee2927cc68da7101fd9ce8616a61b4102bc378429b8b53adbabda584a5e1df98bcdb2b0ec73466c5a51e996dead7b2d286c7025fcafaffe5e64d715997