From 7b5d5c41e7f6c6ba9ade7af36d95b3c2c1ff6e47 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Wed, 25 Oct 2023 11:27:51 +0200
Subject: [PATCH] Update to version 3.1.2; Fixes RHBZ#2242698

---
 .gitignore                   |  2 ++
 rust-trash.spec              | 10 +++++-----
 rust2rpm.toml                |  3 +++
 sources                      |  2 +-
 trash-fix-metadata-auto.diff | 10 +++++-----
 5 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 rust2rpm.toml

diff --git a/.gitignore b/.gitignore
index 2de00b4..034b450 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 /trash-2.1.3.crate
 /trash-2.1.5.crate
 /trash-3.0.6.crate
+/trash-3.1.0.crate
+/trash-3.1.2.crate
diff --git a/rust-trash.spec b/rust-trash.spec
index b3e0e4e..62db36c 100644
--- a/rust-trash.spec
+++ b/rust-trash.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 # * tests require an existing trash folder
 %bcond_with check
 %global debug_package %{nil}
@@ -6,17 +6,17 @@
 %global crate trash
 
 Name:           rust-trash
-Version:        3.0.6
+Version:        3.1.2
 Release:        %autorelease
 Summary:        Library for moving files and folders to the Recycle Bin
 
 License:        MIT
 URL:            https://crates.io/crates/trash
 Source:         %{crates_source}
-# Automatically generated patch to strip foreign dependencies
+# Automatically generated patch to strip dependencies and normalize metadata
 Patch:          trash-fix-metadata-auto.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 A library for moving files and folders to the Recycle Bin.}
@@ -111,7 +111,7 @@ use the "coinit_speed_over_memory" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..612a1a7
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,3 @@
+[tests]
+run = ["none"]
+comments = ["tests require an existing trash folder"]
diff --git a/sources b/sources
index b1b3400..f9e650e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (trash-3.0.6.crate) = 2e3558ddc267939f039acb91ed322e9bc2fcc34424c23a034a9044a49e8e823a921538cd80adca36d12f9f5e1a73f4fd5aa4b1389a590e95bf1bd860b5250859
+SHA512 (trash-3.1.2.crate) = fcc5100ebc81f0f390272c1e6a224297d7274a233caf282bfaae4a7e9af7a3107f41497c4ccd3060e40ab3458915281f392cfc40f650e37de233fd2787d0950c
diff --git a/trash-fix-metadata-auto.diff b/trash-fix-metadata-auto.diff
index 906fb4f..6dc9248 100644
--- a/trash-fix-metadata-auto.diff
+++ b/trash-fix-metadata-auto.diff
@@ -1,17 +1,17 @@
---- trash-3.0.6/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ trash-3.0.6/Cargo.toml	2023-07-21T18:45:29.212025+00:00
+--- trash-3.1.2/Cargo.toml	1970-01-01T00:00:01+00:00
++++ trash-3.1.2/Cargo.toml	2023-10-25T09:28:08.505965+00:00
 @@ -85,19 +85,3 @@
  [target."cfg(all(unix, not(target_os = \"macos\"), not(target_os = \"ios\"), not(target_os = \"android\")))".dependencies.url]
- version = "2.1.0"
+ version = "2.4.1"
  
--[target."cfg(any(target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies.once_cell]
+-[target."cfg(any(target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\"))".dependencies.once_cell]
 -version = "1.7.2"
 -
 -[target."cfg(target_os = \"macos\")".dependencies.objc]
 -version = "0.2.7"
 -
 -[target."cfg(windows)".dependencies.scopeguard]
--version = "1.0.0"
+-version = "1.2.0"
 -
 -[target."cfg(windows)".dependencies.windows]
 -version = "0.44.0"