From b5df713ae2c9bc836c0ea897e548c9e0a2a8ff0d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 6 Jun 2022 22:03:44 +0200 Subject: [PATCH] Update to version 1.1.1; Fixes RHBZ#2076870 --- .gitignore | 1 + rust-uuid.spec | 182 ++++++++++++++++++++++++++++++----------- sources | 2 +- uuid-fix-metadata.diff | 68 +++++++++++---- 4 files changed, 189 insertions(+), 64 deletions(-) diff --git a/.gitignore b/.gitignore index b96a2d7..b47b8c0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /uuid-0.7.4.crate /uuid-0.8.1.crate /uuid-0.8.2.crate +/uuid-1.1.1.crate diff --git a/rust-uuid.spec b/rust-uuid.spec index 8fa4f31..ba78a5c 100644 --- a/rust-uuid.spec +++ b/rust-uuid.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 16 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate uuid Name: rust-%{crate} -Version: 0.8.2 +Version: 1.1.1 Release: %autorelease Summary: Library to generate and parse UUIDs @@ -14,15 +14,13 @@ License: ASL 2.0 or MIT URL: https://crates.io/crates/uuid Source: %{crates_source} # Initial patched metadata -# * No windows +# * drop Windows- and WASM-specific dependencies +# * drop macro-diagnostics and zerocopy features (missing dependencies) Patch0: uuid-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Library to generate and parse UUIDs.} @@ -35,13 +33,17 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%license LICENSE-MIT LICENSE-APACHE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%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 +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -49,23 +51,35 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+getrandom-devel +%package -n %{name}+arbitrary-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+getrandom-devel %{_description} +%description -n %{name}+arbitrary-devel %{_description} + +This package contains library source intended for building other packages which +use the "arbitrary" feature of the "%{crate}" crate. -This package contains library source intended for building other packages -which use "getrandom" feature of "%{crate}" crate. +%files -n %{name}+arbitrary-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+fast-rng-devel +Summary: %{summary} +BuildArch: noarch -%files -n %{name}+getrandom-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%description -n %{name}+fast-rng-devel %{_description} + +This package contains library source intended for building other packages which +use the "fast-rng" feature of the "%{crate}" crate. + +%files -n %{name}+fast-rng-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+md5-devel Summary: %{summary} @@ -73,11 +87,83 @@ BuildArch: noarch %description -n %{name}+md5-devel %{_description} -This package contains library source intended for building other packages -which use "md5" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "md5" feature of the "%{crate}" crate. %files -n %{name}+md5-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+private_atomic-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+private_atomic-devel %{_description} + +This package contains library source intended for building other packages which +use the "private_atomic" feature of the "%{crate}" crate. + +%files -n %{name}+private_atomic-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+private_getrandom-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+private_getrandom-devel %{_description} + +This package contains library source intended for building other packages which +use the "private_getrandom" feature of the "%{crate}" crate. + +%files -n %{name}+private_getrandom-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+private_md-5-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+private_md-5-devel %{_description} + +This package contains library source intended for building other packages which +use the "private_md-5" feature of the "%{crate}" crate. + +%files -n %{name}+private_md-5-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+private_rand-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+private_rand-devel %{_description} + +This package contains library source intended for building other packages which +use the "private_rand" feature of the "%{crate}" crate. + +%files -n %{name}+private_rand-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+private_sha1_smol-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+private_sha1_smol-devel %{_description} + +This package contains library source intended for building other packages which +use the "private_sha1_smol" feature of the "%{crate}" crate. + +%files -n %{name}+private_sha1_smol-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+rng-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+rng-devel %{_description} + +This package contains library source intended for building other packages which +use the "rng" feature of the "%{crate}" crate. + +%files -n %{name}+rng-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+serde-devel Summary: %{summary} @@ -85,11 +171,11 @@ BuildArch: noarch %description -n %{name}+serde-devel %{_description} -This package contains library source intended for building other packages -which use "serde" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "serde" feature of the "%{crate}" crate. %files -n %{name}+serde-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+sha1-devel Summary: %{summary} @@ -97,11 +183,11 @@ BuildArch: noarch %description -n %{name}+sha1-devel %{_description} -This package contains library source intended for building other packages -which use "sha1" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "sha1" feature of the "%{crate}" crate. %files -n %{name}+sha1-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+slog-devel Summary: %{summary} @@ -109,11 +195,11 @@ BuildArch: noarch %description -n %{name}+slog-devel %{_description} -This package contains library source intended for building other packages -which use "slog" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "slog" feature of the "%{crate}" crate. %files -n %{name}+slog-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-devel Summary: %{summary} @@ -121,11 +207,11 @@ BuildArch: noarch %description -n %{name}+std-devel %{_description} -This package contains library source intended for building other packages -which use "std" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+v1-devel Summary: %{summary} @@ -133,11 +219,11 @@ BuildArch: noarch %description -n %{name}+v1-devel %{_description} -This package contains library source intended for building other packages -which use "v1" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "v1" feature of the "%{crate}" crate. %files -n %{name}+v1-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+v3-devel Summary: %{summary} @@ -145,11 +231,11 @@ BuildArch: noarch %description -n %{name}+v3-devel %{_description} -This package contains library source intended for building other packages -which use "v3" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "v3" feature of the "%{crate}" crate. %files -n %{name}+v3-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+v4-devel Summary: %{summary} @@ -157,11 +243,11 @@ BuildArch: noarch %description -n %{name}+v4-devel %{_description} -This package contains library source intended for building other packages -which use "v4" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "v4" feature of the "%{crate}" crate. %files -n %{name}+v4-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+v5-devel Summary: %{summary} @@ -169,11 +255,11 @@ BuildArch: noarch %description -n %{name}+v5-devel %{_description} -This package contains library source intended for building other packages -which use "v5" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "v5" feature of the "%{crate}" crate. %files -n %{name}+v5-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 64cbdb4..7f0a050 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uuid-0.8.2.crate) = 5a1f5ead9a920b9bbc120c02049c24b62ec215765e486d3a15c5015ef49fa506206efb737e6f6555cf6e2eddddfe55f0ca1d7dcfa9aa8bcf3e0ef570a54fa2d8 +SHA512 (uuid-1.1.1.crate) = b894f06fc1103e22876f00d29b40668cf8074d9025f00318ae0791502eff4f5840d088be810b5af3abc74ce710af4c4c0196817eef6748c4c588a3d97ddad30d diff --git a/uuid-fix-metadata.diff b/uuid-fix-metadata.diff index 20fa0f9..2ee3dfb 100644 --- a/uuid-fix-metadata.diff +++ b/uuid-fix-metadata.diff @@ -1,20 +1,58 @@ ---- uuid-0.8.2/Cargo.toml 2021-01-11T06:19:14+00:00 -+++ uuid-0.8.2/Cargo.toml 2021-01-11T09:40:05.846404+00:00 -@@ -64,17 +64,11 @@ +--- 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" - [features] - default = ["std"] --guid = ["winapi"] - std = [] --stdweb = ["getrandom", "getrandom/js"] - v1 = [] +-[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 = ["getrandom"] + v4 = ["rng"] v5 = ["sha1"] --wasm-bindgen = ["getrandom", "getrandom/js"] --[target."cfg(windows)".dependencies.winapi] +- +-[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" --optional = true - [badges.appveyor] - repository = "uuid-rs/uuid" +- +-[target."cfg(windows)".dev-dependencies.winapi] +-version = "0.3" +-features = [ +- "combaseapi", +- "impl-default", +-] + [badges.is-it-maintained-issue-resolution] + repository = "uuid-rs/uuid"