From 6e0f9b40b846890d7d7e89123d3efa86361b2bd0 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sun, 22 Sep 2024 01:13:34 +0200
Subject: [PATCH] Disable tests and drop support for tokio v0.1

---
 rust-xz2.spec         | 49 +++++++------------------------------------
 rust2rpm.conf         |  2 --
 rust2rpm.toml         | 11 ++++++++++
 xz2-fix-metadata.diff | 31 +++++++++++++++++++++------
 4 files changed, 43 insertions(+), 50 deletions(-)
 delete mode 100644 rust2rpm.conf
 create mode 100644 rust2rpm.toml

diff --git a/rust-xz2.spec b/rust-xz2.spec
index 95ad957..8f7ea8b 100644
--- a/rust-xz2.spec
+++ b/rust-xz2.spec
@@ -1,5 +1,6 @@
-# Generated by rust2rpm 24
-%bcond_without check
+# Generated by rust2rpm 26
+# * outdated dev-dependencies: tokio v0.1
+%bcond_with check
 %global debug_package %{nil}
 
 %global crate xz2
@@ -14,10 +15,11 @@ License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/xz2
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
+# * drop unused support for tokio v0.1
 # * drop feature for statically linking liblzma
 Patch:          xz2-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Rust bindings to liblzma providing Read/Write streams as well as low-
@@ -52,44 +54,8 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+futures-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+futures-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "futures" feature of the "%{crate}" crate.
-
-%files       -n %{name}+futures-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+tokio-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+tokio-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "tokio" feature of the "%{crate}" crate.
-
-%files       -n %{name}+tokio-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+tokio-io-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+tokio-io-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "tokio-io" feature of the "%{crate}" crate.
-
-%files       -n %{name}+tokio-io-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
@@ -103,8 +69,7 @@ use the "tokio-io" feature of the "%{crate}" crate.
 
 %if %{with check}
 %check
-# * skip a test that relies on files which are not included in published crates
-%cargo_test -- -- --skip standard_files
+%cargo_test
 %endif
 
 %changelog
diff --git a/rust2rpm.conf b/rust2rpm.conf
deleted file mode 100644
index 797832d..0000000
--- a/rust2rpm.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[DEFAULT]
-summary = Rust bindings to liblzma
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..beef4f0
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,11 @@
+[package]
+summary = "Rust bindings to liblzma"
+cargo-toml-patch-comments = [
+    "drop unused support for tokio v0.1",
+    "drop feature for statically linking liblzma",
+]
+
+[tests]
+run = ["none"]
+comments = ["outdated dev-dependencies: tokio v0.1"]
+
diff --git a/xz2-fix-metadata.diff b/xz2-fix-metadata.diff
index 5f8b10d..1be35a3 100644
--- a/xz2-fix-metadata.diff
+++ b/xz2-fix-metadata.diff
@@ -1,10 +1,29 @@
 --- xz2-0.1.7/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ xz2-0.1.7/Cargo.toml	2023-08-07T18:47:19.875968+00:00
-@@ -60,7 +60,6 @@
++++ xz2-0.1.7/Cargo.toml	2024-09-21T23:12:17.487893+00:00
+@@ -39,16 +39,8 @@
+     "futures",
+ ]
+ 
+-[dependencies.futures]
+-version = "0.1.26"
+-optional = true
+-
+ [dependencies.lzma-sys]
+ version = "0.1.18"
+-
+-[dependencies.tokio-io]
+-version = "0.1.12"
+-optional = true
+ 
+ [dev-dependencies.quickcheck]
+ version = "1.0.1"
+@@ -59,9 +51,3 @@
+ [dev-dependencies.tokio-core]
  version = "0.1.17"
  
- [features]
+-[features]
 -static = ["lzma-sys/static"]
- tokio = [
-     "tokio-io",
-     "futures",
+-tokio = [
+-    "tokio-io",
+-    "futures",
+-]