From a0703b58d5578fa271269f78dae9921165c3a4d4 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 30 Jan 2024 13:42:38 +0100 Subject: [PATCH] Update to version 1.7.0; Fixes RHBZ#2259067 --- .gitignore | 1 + rust-uuid.spec | 54 +------------------------------------ sources | 2 +- uuid-fix-metadata-auto.diff | 13 +++------ uuid-fix-metadata.diff | 48 ++++++++++++++++++++------------- 5 files changed, 37 insertions(+), 81 deletions(-) diff --git a/.gitignore b/.gitignore index 2eb5097..4b22b76 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /uuid-1.4.1.crate /uuid-1.5.0.crate /uuid-1.6.1.crate +/uuid-1.7.0.crate diff --git a/rust-uuid.spec b/rust-uuid.spec index 055671e..cf327db 100644 --- a/rust-uuid.spec +++ b/rust-uuid.spec @@ -5,7 +5,7 @@ %global crate uuid Name: rust-uuid -Version: 1.6.1 +Version: 1.7.0 Release: %autorelease Summary: Library to generate and parse UUIDs @@ -37,13 +37,9 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license %{crate_instdir}/COPYRIGHT %license %{crate_instdir}/LICENSE-APACHE %license %{crate_instdir}/LICENSE-MIT -%doc %{crate_instdir}/CODE_OF_CONDUCT.md -%doc %{crate_instdir}/CONTRIBUTING.md %doc %{crate_instdir}/README.md -%doc %{crate_instdir}/SECURITY.md %{crate_instdir}/ %package -n %{name}+default-devel @@ -106,30 +102,6 @@ use the "fast-rng" feature of the "%{crate}" crate. %files -n %{name}+fast-rng-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+getrandom-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+getrandom-devel %{_description} - -This package contains library source intended for building other packages which -use the "getrandom" feature of the "%{crate}" crate. - -%files -n %{name}+getrandom-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+md-5-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+md-5-devel %{_description} - -This package contains library source intended for building other packages which -use the "md-5" feature of the "%{crate}" crate. - -%files -n %{name}+md-5-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+md5-devel Summary: %{summary} BuildArch: noarch @@ -142,18 +114,6 @@ use the "md5" feature of the "%{crate}" crate. %files -n %{name}+md5-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+rand-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+rand-devel %{_description} - -This package contains library source intended for building other packages which -use the "rand" feature of the "%{crate}" crate. - -%files -n %{name}+rand-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+rng-devel Summary: %{summary} BuildArch: noarch @@ -190,18 +150,6 @@ use the "sha1" feature of the "%{crate}" crate. %files -n %{name}+sha1-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+sha1_smol-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+sha1_smol-devel %{_description} - -This package contains library source intended for building other packages which -use the "sha1_smol" feature of the "%{crate}" crate. - -%files -n %{name}+sha1_smol-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+slog-devel Summary: %{summary} BuildArch: noarch diff --git a/sources b/sources index 813ac50..9a593e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uuid-1.6.1.crate) = b9f3dbad176b3640b4b943d127ac8fcd0938e7bc750430626cc603efdcf5faf479f8de7940d64ed1b5b6e6378b42a1aaf3c1e791ee59b9db9394409261cf3c55 +SHA512 (uuid-1.7.0.crate) = 2ea704d082b725d98717d772e1af84fe743929ee32658ebeb111c6fa2395ff5f44558b7e375087617f91c6f7bc242f2db96e80a631071722de6fe15af845e856 diff --git a/uuid-fix-metadata-auto.diff b/uuid-fix-metadata-auto.diff index ebe9c01..efbb3ac 100644 --- a/uuid-fix-metadata-auto.diff +++ b/uuid-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- uuid-1.6.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ uuid-1.6.1/Cargo.toml 2023-11-25T12:07:02.306458+00:00 -@@ -184,17 +184,6 @@ +--- uuid-1.7.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ uuid-1.7.0/Cargo.toml 2024-01-30T12:39:54.882093+00:00 +@@ -192,12 +192,6 @@ ] v8 = [] @@ -9,16 +9,11 @@ - -[target."cfg(target = \"wasm32-unknown-unknown\")".dev-dependencies.wasm-bindgen] -version = "0.2" --package = "wasm-bindgen" -- --[target."cfg(windows)".dev-dependencies.windows-sys] --version = "0.48.0" --features = ["Win32_System_Com"] - [badges.is-it-maintained-issue-resolution] repository = "uuid-rs/uuid" -@@ -203,3 +192,4 @@ +@@ -206,3 +200,4 @@ [badges.maintenance] status = "actively-developed" diff --git a/uuid-fix-metadata.diff b/uuid-fix-metadata.diff index 8489e4e..257054e 100644 --- a/uuid-fix-metadata.diff +++ b/uuid-fix-metadata.diff @@ -1,29 +1,33 @@ ---- uuid-1.6.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ uuid-1.6.1/Cargo.toml 2023-11-25T12:07:30.448571+00:00 -@@ -85,10 +85,6 @@ +--- uuid-1.7.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ uuid-1.7.0/Cargo.toml 2024-01-30T12:40:26.586271+00:00 +@@ -89,16 +89,6 @@ + optional = true default-features = false - package = "atomic" -[dependencies.borsh] --version = "0.10.3" +-version = "1" +-optional = true +-default-features = false +- +-[dependencies.borsh-derive] +-version = "1" -optional = true +-default-features = false - [dependencies.bytemuck] version = "1.14.0" features = ["derive"] -@@ -125,20 +121,6 @@ +@@ -131,18 +121,6 @@ version = "2" optional = true -[dependencies.uuid-macro-internal] --version = "1.6.1" +-version = "1.7.0" -optional = true --package = "uuid-macro-internal" - -[dependencies.wasm-bindgen] -version = "0.2" -optional = true --package = "wasm-bindgen" - -[dependencies.zerocopy] -version = "0.6" @@ -32,16 +36,24 @@ [dev-dependencies.bincode] version = "1.0" -@@ -163,12 +145,6 @@ +@@ -163,20 +141,11 @@ + + [features] + atomic = ["dep:atomic"] +-borsh = [ +- "dep:borsh", +- "dep:borsh-derive", +-] + default = ["std"] + fast-rng = [ "rng", - "rand", + "dep:rand", ] -js = [ -- "wasm-bindgen", -- "getrandom", -- "getrandom/js", +- "dep:wasm-bindgen", +- "getrandom?/js", -] --macro-diagnostics = ["uuid-macro-internal"] - md5 = ["md-5"] - rng = ["getrandom"] - sha1 = ["sha1_smol"] +-macro-diagnostics = ["dep:uuid-macro-internal"] + md5 = ["dep:md-5"] + rng = ["dep:getrandom"] + sha1 = ["dep:sha1_smol"]