From 8911af484db5327cb9491e7f78d9eb936fbe8eb2 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sun, 20 Oct 2024 16:22:44 +0200
Subject: [PATCH] Update to version 1.11.0; Fixes RHBZ#2319073

---
 .gitignore                  |  1 +
 rust-uuid.spec              | 15 ++-------------
 rust2rpm.toml               |  1 +
 sources                     |  2 +-
 uuid-fix-metadata-auto.diff | 18 +++++++++---------
 uuid-fix-metadata.diff      | 25 +++++++++++++++----------
 6 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 59206c1..2628f51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /uuid-1.9.0.crate
 /uuid-1.9.1.crate
 /uuid-1.10.0.crate
+/uuid-1.11.0.crate
diff --git a/rust-uuid.spec b/rust-uuid.spec
index 43d43d7..d4f3e4c 100644
--- a/rust-uuid.spec
+++ b/rust-uuid.spec
@@ -5,7 +5,7 @@
 %global crate uuid
 
 Name:           rust-uuid
-Version:        1.10.0
+Version:        1.11.0
 Release:        %autorelease
 Summary:        Library to generate and parse UUIDs
 
@@ -16,6 +16,7 @@ Source:         %{crates_source}
 Patch:          uuid-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
 # * drop unused optional dependency for borsh support
+# * drop unused optional dependency for zerocopy support
 # * drop WASM-specific features and dependencies
 # * drop internal-only features
 Patch:          uuid-fix-metadata.diff
@@ -258,18 +259,6 @@ 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
index fff43b4..e5f386f 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,6 +1,7 @@
 [package]
 cargo-toml-patch-comments = [
     "drop unused optional dependency for borsh support",
+    "drop unused optional dependency for zerocopy support",
     "drop WASM-specific features and dependencies",
     "drop internal-only features",
 ]
diff --git a/sources b/sources
index 7a34b4c..9a93700 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (uuid-1.10.0.crate) = e17db9433d919b51468acaebd240a2cb218d07f099fade49118ca9313f8cdf6aa3103e7aa24440be65a4f25a25f8f511e36dba08cbef27747f9e43b849cd612b
+SHA512 (uuid-1.11.0.crate) = 0cd1b95fc2247bf4e627de6abb41e332ebaf39e5720640e52b9f235f7a0e2d451e7a486efdabb616ce00e47832d21919611683d0e6a71c86a86f290940cfda32
diff --git a/uuid-fix-metadata-auto.diff b/uuid-fix-metadata-auto.diff
index 6a9fed9..e0387a4 100644
--- a/uuid-fix-metadata-auto.diff
+++ b/uuid-fix-metadata-auto.diff
@@ -1,6 +1,6 @@
---- uuid-1.10.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ uuid-1.10.0/Cargo.toml	2024-07-31T15:34:42.021322+00:00
-@@ -169,7 +169,6 @@
+--- uuid-1.11.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ uuid-1.11.0/Cargo.toml	2024-10-20T14:19:57.658776+00:00
+@@ -178,7 +178,6 @@
      "dep:rand",
  ]
  js = [
@@ -8,25 +8,25 @@
      "getrandom?/js",
  ]
  macro-diagnostics = ["dep:uuid-macro-internal"]
-@@ -185,16 +184,6 @@
+@@ -194,16 +193,6 @@
  v7 = ["rng"]
  v8 = []
  
--[target."cfg(all(target_arch = \"wasm32\", target_vendor = \"unknown\", target_os = \"unknown\"))".dependencies.wasm-bindgen]
+-[target.'cfg(all(target_arch = "wasm32", target_vendor = "unknown", target_os = "unknown"))'.dependencies.wasm-bindgen]
 -version = "0.2"
 -optional = true
 -
--[target."cfg(all(target_arch = \"wasm32\", target_vendor = \"unknown\", target_os = \"unknown\"))".dev-dependencies.wasm-bindgen-test]
+-[target.'cfg(all(target_arch = "wasm32", target_vendor = "unknown", target_os = "unknown"))'.dev-dependencies.wasm-bindgen-test]
 -version = "0.3"
 -
--[target."cfg(target = \"wasm32-unknown-unknown\")".dev-dependencies.wasm-bindgen]
+-[target.'cfg(target = "wasm32-unknown-unknown")'.dev-dependencies.wasm-bindgen]
 -version = "0.2"
 -
  [badges.is-it-maintained-issue-resolution]
  repository = "uuid-rs/uuid"
  
-@@ -207,3 +196,4 @@
- [lints.rust.unexpected_cfgs]
+@@ -217,3 +206,4 @@
  level = "allow"
  priority = 0
+ check-cfg = ["cfg(uuid_unstable)"]
 +
diff --git a/uuid-fix-metadata.diff b/uuid-fix-metadata.diff
index 798f6c3..cebc019 100644
--- a/uuid-fix-metadata.diff
+++ b/uuid-fix-metadata.diff
@@ -1,6 +1,6 @@
---- uuid-1.10.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ uuid-1.10.0/Cargo.toml	2024-07-31T15:36:07.779549+00:00
-@@ -48,7 +48,6 @@
+--- uuid-1.11.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ uuid-1.11.0/Cargo.toml	2024-10-20T14:20:19.529890+00:00
+@@ -53,7 +53,6 @@
      "serde",
      "arbitrary",
      "slog",
@@ -8,7 +8,7 @@
      "v1",
      "v3",
      "v4",
-@@ -88,16 +87,6 @@
+@@ -97,16 +96,6 @@
  optional = true
  default-features = false
  
@@ -25,18 +25,23 @@
  [dependencies.bytemuck]
  version = "1.14.0"
  features = ["derive"]
-@@ -130,10 +119,6 @@
+@@ -139,15 +128,6 @@
  version = "2"
  optional = true
  
 -[dependencies.uuid-macro-internal]
--version = "1.10.0"
+-version = "1.11.0"
 -optional = true
 -
- [dependencies.zerocopy]
- version = "0.7"
- features = ["derive"]
-@@ -159,19 +144,11 @@
+-[dependencies.zerocopy]
+-version = "0.8"
+-features = ["derive"]
+-optional = true
+-
+ [dev-dependencies.bincode]
+ version = "1.0"
+ 
+@@ -168,19 +148,11 @@
  
  [features]
  atomic = ["dep:atomic"]