From befa5c4fb09b3477447a89651e31da5544d080e8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 2 Dec 2023 01:38:47 +0100 Subject: [PATCH] Update to version 0.31.0; Fixes RHBZ#2245734 --- .gitignore | 1 + quick-xml-fix-metadata.diff | 25 +++++++------------------ rust-quick-xml.spec | 23 +++++++++++++++++------ sources | 2 +- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 8e9dc3f..bccd884 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /quick-xml-0.27.1.crate /quick-xml-0.28.2.crate /quick-xml-0.30.0.crate +/quick-xml-0.31.0.crate diff --git a/quick-xml-fix-metadata.diff b/quick-xml-fix-metadata.diff index 8db27dc..557ef2f 100644 --- a/quick-xml-fix-metadata.diff +++ b/quick-xml-fix-metadata.diff @@ -1,23 +1,12 @@ ---- quick-xml-0.30.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ quick-xml-0.30.0/Cargo.toml 2023-08-10T19:35:32.270739+00:00 -@@ -103,10 +103,6 @@ - features = ["derive"] - optional = true - --[dependencies.document-features] --version = "0.2" --optional = true -- - [dependencies.encoding_rs] - version = "0.8" - optional = true -@@ -123,9 +119,6 @@ - features = ["io-util"] +--- quick-xml-0.31.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ quick-xml-0.31.0/Cargo.toml 2023-12-02T00:35:50.410440+00:00 +@@ -134,9 +134,6 @@ optional = true default-features = false -- + -[dev-dependencies.criterion] -version = "0.4" - +- [dev-dependencies.pretty_assertions] - version = "1.3" + version = "1.4" + diff --git a/rust-quick-xml.spec b/rust-quick-xml.spec index 7a4a592..f301849 100644 --- a/rust-quick-xml.spec +++ b/rust-quick-xml.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate quick-xml Name: rust-quick-xml -Version: 0.30.0 +Version: 0.31.0 Release: %autorelease Summary: High performance xml reader and writer @@ -13,11 +13,10 @@ License: MIT URL: https://crates.io/crates/quick-xml Source: %{crates_source} # Manually created patch for downstream crate metadata changes -# * drop unused, benchmark-only criterion dev-dependency to speed up builds -# * drop unused, optional document-features dependency +# * drop unused, benchmark-only criterion dev-dependency Patch: quick-xml-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: High performance xml reader and writer.} @@ -74,6 +73,18 @@ use the "async-tokio" feature of the "%{crate}" crate. %files -n %{name}+async-tokio-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+document-features-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+document-features-devel %{_description} + +This package contains library source intended for building other packages which +use the "document-features" feature of the "%{crate}" crate. + +%files -n %{name}+document-features-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+encoding-devel Summary: %{summary} BuildArch: noarch @@ -171,7 +182,7 @@ use the "tokio" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires diff --git a/sources b/sources index eaaff78..d41dbcb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (quick-xml-0.30.0.crate) = e731f9c6795da7ad705c96544b39560dc27e2ea3c468c3dffe9589bb314074e96acbc0ab454f94556e0d9569c55d6cd8d1c7be2c823a77bbb3165ec8393d9aee +SHA512 (quick-xml-0.31.0.crate) = 9b1f4f9c32694ccb244938a9a4e9373c3902314afb6af5d2f6b1be55e5ec63fee5cf1085f8f32161570cc10fdd96f3375c7564b1d884bb152542b86593f175de