From 7006027c6d1eecf0fdbd058e3d2a51961e0f4391 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 24 Jun 2024 18:40:22 +0200
Subject: [PATCH] Update to version 1.9.0; Fixes RHBZ#2293884

---
 .gitignore                  |  1 +
 rust-uuid.spec              | 14 +++++++++++++-
 rust2rpm.toml               |  7 +++++++
 sources                     |  2 +-
 uuid-fix-metadata-auto.diff | 12 ++++++------
 uuid-fix-metadata.diff      | 22 +++++++++-------------
 6 files changed, 37 insertions(+), 21 deletions(-)
 create mode 100644 rust2rpm.toml

diff --git a/.gitignore b/.gitignore
index f086dc1..3fb8ed7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /uuid-1.6.1.crate
 /uuid-1.7.0.crate
 /uuid-1.8.0.crate
+/uuid-1.9.0.crate
diff --git a/rust-uuid.spec b/rust-uuid.spec
index 4c83cf8..44f1903 100644
--- a/rust-uuid.spec
+++ b/rust-uuid.spec
@@ -5,7 +5,7 @@
 %global crate uuid
 
 Name:           rust-uuid
-Version:        1.8.0
+Version:        1.9.0
 Release:        %autorelease
 Summary:        Library to generate and parse UUIDs
 
@@ -258,6 +258,18 @@ use the "v8" feature of the "%{crate}" crate.
 %files       -n %{name}+v8-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+zerocopy-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+zerocopy-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "zerocopy" feature of the "%{crate}" crate.
+
+%files       -n %{name}+zerocopy-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %prep
 %autosetup -n %{crate}-%{version} -p1
 %cargo_prep
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..fff43b4
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,7 @@
+[package]
+cargo-toml-patch-comments = [
+    "drop unused optional dependency for borsh support",
+    "drop WASM-specific features and dependencies",
+    "drop internal-only features",
+]
+
diff --git a/sources b/sources
index 9a35dc4..70d43da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (uuid-1.8.0.crate) = fe254f0bf6b863538ce568405569a4c755b33bce561148661b10985bf4485fa7ee7a6ec650d93656552b3cdead46b2074ebfd45b040edef19cd1648300f68ed5
+SHA512 (uuid-1.9.0.crate) = d04b525d6f2452c2aeaa15de7b754a3ca9867ffb27f1d94df22ce5ba024996c890e06f4c69a9104399b364c7292570359f922ad7e6980f477b6b336c8ad5557a
diff --git a/uuid-fix-metadata-auto.diff b/uuid-fix-metadata-auto.diff
index 4ff863a..e3068ea 100644
--- a/uuid-fix-metadata-auto.diff
+++ b/uuid-fix-metadata-auto.diff
@@ -1,5 +1,5 @@
---- uuid-1.8.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ uuid-1.8.0/Cargo.toml	2024-03-19T19:40:55.258557+00:00
+--- uuid-1.9.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ uuid-1.9.0/Cargo.toml	2024-06-24T16:35:28.093978+00:00
 @@ -169,7 +169,6 @@
      "dep:rand",
  ]
@@ -25,8 +25,8 @@
  [badges.is-it-maintained-issue-resolution]
  repository = "uuid-rs/uuid"
  
-@@ -206,3 +195,4 @@
- 
- [badges.maintenance]
- status = "actively-developed"
+@@ -210,3 +199,4 @@
+ [lints.rust.unexpected_cfgs]
+ level = "allow"
+ priority = 0
 +
diff --git a/uuid-fix-metadata.diff b/uuid-fix-metadata.diff
index 21f92da..6338543 100644
--- a/uuid-fix-metadata.diff
+++ b/uuid-fix-metadata.diff
@@ -1,6 +1,6 @@
---- uuid-1.8.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ uuid-1.8.0/Cargo.toml	2024-03-19T19:42:03.438839+00:00
-@@ -89,16 +89,6 @@
+--- uuid-1.9.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ uuid-1.9.0/Cargo.toml	2024-06-24T16:36:48.035279+00:00
+@@ -88,16 +88,6 @@
  optional = true
  default-features = false
  
@@ -17,22 +17,18 @@
  [dependencies.bytemuck]
  version = "1.14.0"
  features = ["derive"]
-@@ -131,14 +121,6 @@
+@@ -130,10 +120,6 @@
  version = "2"
  optional = true
  
 -[dependencies.uuid-macro-internal]
--version = "1.8.0"
+-version = "1.9.0"
 -optional = true
 -
--[dependencies.zerocopy]
--version = "0.6"
--optional = true
--
- [dev-dependencies.bincode]
- version = "1.0"
- 
-@@ -159,19 +141,11 @@
+ [dependencies.zerocopy]
+ version = "0.7"
+ features = ["derive"]
+@@ -159,19 +145,11 @@
  
  [features]
  atomic = ["dep:atomic"]