From 4b5ea7a104f52401c522cf5dd9e2e56a8ca2f143 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 28 Jul 2022 23:08:25 +0200
Subject: [PATCH] Update to version 0.23.0; Fixes RHBZ#2090320

---
 .gitignore                  |  1 +
 quick-xml-fix-metadata.diff | 12 +++++++
 rust-quick-xml.spec         | 65 +++++++++++++++++++------------------
 sources                     |  2 +-
 4 files changed, 47 insertions(+), 33 deletions(-)
 create mode 100644 quick-xml-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index afb0856..94a5efe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /quick-xml-0.18.1.crate
 /quick-xml-0.20.0.crate
 /quick-xml-0.22.0.crate
+/quick-xml-0.23.0.crate
diff --git a/quick-xml-fix-metadata.diff b/quick-xml-fix-metadata.diff
new file mode 100644
index 0000000..7819737
--- /dev/null
+++ b/quick-xml-fix-metadata.diff
@@ -0,0 +1,12 @@
+--- quick-xml-0.23.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ quick-xml-0.23.0/Cargo.toml	2022-07-28T18:39:06.943614+00:00
+@@ -65,9 +65,6 @@
+ version = "1.0"
+ optional = true
+ 
+-[dev-dependencies.criterion]
+-version = "0.3"
+-
+ [dev-dependencies.pretty_assertions]
+ version = "1.2"
+ 
diff --git a/rust-quick-xml.spec b/rust-quick-xml.spec
index 65f6080..8f9ff72 100644
--- a/rust-quick-xml.spec
+++ b/rust-quick-xml.spec
@@ -1,25 +1,24 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 22
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate quick-xml
 
-Name:           rust-%{crate}
-Version:        0.22.0
+Name:           rust-quick-xml
+Version:        0.23.0
 Release:        %autorelease
 Summary:        High performance xml reader and writer
 
-# Upstream license specification: MIT
 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
+Patch:          quick-xml-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif
 
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 High performance xml reader and writer.}
@@ -32,13 +31,14 @@ 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.md
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-MIT.md
+%doc %{crate_instdir}/Changelog.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -46,11 +46,11 @@ 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}+encoding-devel
 Summary:        %{summary}
@@ -58,11 +58,11 @@ BuildArch:      noarch
 
 %description -n %{name}+encoding-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "encoding" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "encoding" feature of the "%{crate}" crate.
 
 %files       -n %{name}+encoding-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+encoding_rs-devel
 Summary:        %{summary}
@@ -70,11 +70,11 @@ BuildArch:      noarch
 
 %description -n %{name}+encoding_rs-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "encoding_rs" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "encoding_rs" feature of the "%{crate}" crate.
 
 %files       -n %{name}+encoding_rs-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+escape-html-devel
 Summary:        %{summary}
@@ -82,11 +82,11 @@ BuildArch:      noarch
 
 %description -n %{name}+escape-html-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "escape-html" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "escape-html" feature of the "%{crate}" crate.
 
 %files       -n %{name}+escape-html-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+serde-devel
 Summary:        %{summary}
@@ -94,11 +94,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}+serialize-devel
 Summary:        %{summary}
@@ -106,11 +106,11 @@ BuildArch:      noarch
 
 %description -n %{name}+serialize-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "serialize" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "serialize" feature of the "%{crate}" crate.
 
 %files       -n %{name}+serialize-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
@@ -127,7 +127,8 @@ which use "serialize" feature of "%{crate}" crate.
 
 %if %{with check}
 %check
-%cargo_test
+# * skip a failing test: https://github.com/tafia/quick-xml/issues/443
+%cargo_test -- -- --skip test_writer_indent_cdata
 %endif
 
 %changelog
diff --git a/sources b/sources
index be2efa6..7b0d878 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (quick-xml-0.22.0.crate) = 15e56fafc84e62b219977c5ab0f07a021bb71216d7cbb673a7ffec4ec6bda36f97d7b7034751b0b7d745df7c17c1a591a281cf2c97aa4fada7327979711ae3dd
+SHA512 (quick-xml-0.23.0.crate) = 9f2cea83e81e7f5de8a5ccd883c9d83cebf9169ffeba5a7355aca9925c7d2bb2216f0803203b91709dea292f89111bfe1e9ae6d34e84741473df5b00a3b21340