From 8b53bae30f7674d750a9a169e79ed38311a8ff57 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 8 Aug 2022 16:03:41 +0200
Subject: [PATCH] Update to version 1.1.2; Fixes RHBZ#2095908

---
 .gitignore                  |  1 +
 rust-uuid.spec              | 15 ++++------
 rust2rpm.conf               |  6 ++++
 sources                     |  2 +-
 uuid-fix-metadata-auto.diff | 23 +++++++++++++++
 uuid-fix-metadata.diff      | 58 -------------------------------------
 6 files changed, 37 insertions(+), 68 deletions(-)
 create mode 100644 rust2rpm.conf
 create mode 100644 uuid-fix-metadata-auto.diff
 delete mode 100644 uuid-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index b47b8c0..c42e083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /uuid-0.8.1.crate
 /uuid-0.8.2.crate
 /uuid-1.1.1.crate
+/uuid-1.1.2.crate
diff --git a/rust-uuid.spec b/rust-uuid.spec
index ba78a5c..c589831 100644
--- a/rust-uuid.spec
+++ b/rust-uuid.spec
@@ -1,22 +1,19 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 22
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate uuid
 
-Name:           rust-%{crate}
-Version:        1.1.1
+Name:           rust-uuid
+Version:        1.1.2
 Release:        %autorelease
 Summary:        Library to generate and parse UUIDs
 
-# Upstream license specification: Apache-2.0 OR MIT
-License:        ASL 2.0 or MIT
+License:        Apache-2.0 OR MIT
 URL:            https://crates.io/crates/uuid
 Source:         %{crates_source}
-# Initial patched metadata
-# * drop Windows- and WASM-specific dependencies
-# * drop macro-diagnostics and zerocopy features (missing dependencies)
-Patch0:         uuid-fix-metadata.diff
+# Automatically generated patch to strip foreign dependencies
+Patch:          uuid-fix-metadata-auto.diff
 
 ExclusiveArch:  %{rust_arches}
 
diff --git a/rust2rpm.conf b/rust2rpm.conf
new file mode 100644
index 0000000..0441496
--- /dev/null
+++ b/rust2rpm.conf
@@ -0,0 +1,6 @@
+[DEFAULT]
+unwanted-features =
+  private_uuid-macro-internal
+  zerocopy
+  js
+  macro-diagnostics
diff --git a/sources b/sources
index 7f0a050..e7642ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (uuid-1.1.1.crate) = b894f06fc1103e22876f00d29b40668cf8074d9025f00318ae0791502eff4f5840d088be810b5af3abc74ce710af4c4c0196817eef6748c4c588a3d97ddad30d
+SHA512 (uuid-1.1.2.crate) = de1d1019d224c248e19cbf8a8539dc55937b23f74c5a8b11a445f8b7c155d35caa2001d6c710f4a4a8c034446162ef32c0e3be9f3d43631477c6f3d350acf7d0
diff --git a/uuid-fix-metadata-auto.diff b/uuid-fix-metadata-auto.diff
new file mode 100644
index 0000000..7dc6cf4
--- /dev/null
+++ b/uuid-fix-metadata-auto.diff
@@ -0,0 +1,23 @@
+--- uuid-1.1.2/Cargo.toml	1970-01-01T00:00:01+00:00
++++ uuid-1.1.2/Cargo.toml	1970-01-01T00:00:01+00:00
+@@ -146,20 +146,6 @@
+ v4 = ["rng"]
+ v5 = ["sha1"]
+ 
+-[target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-lib]
+-version = "0.2"
+-package = "wasm-bindgen"
+-
+-[target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
+-version = "0.3"
+-
+-[target."cfg(windows)".dev-dependencies.winapi]
+-version = "0.3"
+-features = [
+-    "combaseapi",
+-    "impl-default",
+-]
+-
+ [badges.is-it-maintained-issue-resolution]
+ repository = "uuid-rs/uuid"
+ 
diff --git a/uuid-fix-metadata.diff b/uuid-fix-metadata.diff
deleted file mode 100644
index 2ee3dfb..0000000
--- a/uuid-fix-metadata.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- uuid-1.1.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ uuid-1.1.1/Cargo.toml	2022-06-05T11:11:54.627508+00:00
-@@ -90,11 +90,6 @@
- default-features = false
- package = "sha1_smol"
- 
--[dependencies.private_uuid-macro-internal]
--version = "1.1.1"
--optional = true
--package = "uuid-macro-internal"
--
- [dependencies.serde]
- version = "1.0.56"
- optional = true
-@@ -102,10 +97,6 @@
- 
- [dependencies.slog]
- version = "2"
--optional = true
--
--[dependencies.zerocopy]
--version = "0.6"
- optional = true
- 
- [dev-dependencies.bincode]
-@@ -132,11 +123,6 @@
-     "rng",
-     "private_rand",
- ]
--js = [
--    "private_getrandom",
--    "private_getrandom/js",
--]
--macro-diagnostics = ["private_uuid-macro-internal"]
- md5 = ["private_md-5"]
- rng = ["private_getrandom"]
- sha1 = ["private_sha1_smol"]
-@@ -145,20 +131,6 @@
- v3 = ["md5"]
- v4 = ["rng"]
- v5 = ["sha1"]
--
--[target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-lib]
--version = "0.2"
--package = "wasm-bindgen"
--
--[target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
--version = "0.3"
--
--[target."cfg(windows)".dev-dependencies.winapi]
--version = "0.3"
--features = [
--    "combaseapi",
--    "impl-default",
--]
- 
- [badges.is-it-maintained-issue-resolution]
- repository = "uuid-rs/uuid"