From dcd795de9f755920f27dea64acd0ab1965382944 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 12 Apr 2024 14:52:48 +0200
Subject: [PATCH] Update to version 0.8.34; Fixes RHBZ#2274293

---
 .gitignore                    |  1 +
 encoding_rs-fix-metadata.diff | 27 ++++++++++-----------------
 rust-encoding_rs.spec         | 10 +++++-----
 sources                       |  2 +-
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index adc3e21..a591e1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /encoding_rs-0.8.31.crate
 /encoding_rs-0.8.32.crate
 /encoding_rs-0.8.33.crate
+/encoding_rs-0.8.34.crate
diff --git a/encoding_rs-fix-metadata.diff b/encoding_rs-fix-metadata.diff
index 284ec1b..ca0c6c6 100644
--- a/encoding_rs-fix-metadata.diff
+++ b/encoding_rs-fix-metadata.diff
@@ -1,34 +1,27 @@
---- encoding_rs-0.8.33/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ encoding_rs-0.8.33/Cargo.toml	2023-08-27T11:41:53.824286+00:00
-@@ -32,16 +32,16 @@
+--- encoding_rs-0.8.34/Cargo.toml	1970-01-01T00:00:01+00:00
++++ encoding_rs-0.8.34/Cargo.toml	2024-04-12T12:48:36.671377+00:00
+@@ -33,13 +33,15 @@
  ]
  license = "(Apache-2.0 OR MIT) AND BSD-3-Clause"
  repository = "https://github.com/hsivonen/encoding_rs"
 +exclude = [
++    "/ci/",
++    "/doc/",
 +    "/generate-encoding-data.py",
 +    "/rustfmt.toml",
 +]
  
  [profile.release]
  lto = true
- 
- [dependencies.cfg-if]
- version = "1.0"
 -
--[dependencies.packed_simd]
--version = "0.3.9"
+-[dependencies.any_all_workaround]
+-version = "0.1.0"
 -optional = true
  
- [dependencies.serde]
+ [dependencies.cfg-if]
  version = "1.0"
-@@ -74,10 +74,6 @@
+@@ -75,4 +77,3 @@
  less-slow-big5-hanzi-encode = []
  less-slow-gb-hanzi-encode = []
  less-slow-kanji-encode = []
--simd-accel = [
--    "packed_simd",
--    "packed_simd/into_bits",
--]
- 
- [badges.travis-ci]
- repository = "hsivonen/encoding_rs"
+-simd-accel = ["any_all_workaround"]
diff --git a/rust-encoding_rs.spec b/rust-encoding_rs.spec
index 90c0204..757958d 100644
--- a/rust-encoding_rs.spec
+++ b/rust-encoding_rs.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 26
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate encoding_rs
 
 Name:           rust-encoding_rs
-Version:        0.8.33
+Version:        0.8.34
 Release:        %autorelease
 Summary:        Gecko-oriented implementation of the Encoding Standard
 
@@ -16,10 +16,10 @@ URL:            https://crates.io/crates/encoding_rs
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
 # * drop unneeded script: https://github.com/hsivonen/encoding_rs/pull/38
-# * drop simd_accel feature / optional packed_simd_2 dependency
+# * drop simd_accel feature and armv7hl-specific any_all_workaround dependency
 Patch:          encoding_rs-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 A Gecko-oriented implementation of the Encoding Standard.}
@@ -190,7 +190,7 @@ use the "serde" 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 80fa734..c6c694a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (encoding_rs-0.8.33.crate) = 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc
+SHA512 (encoding_rs-0.8.34.crate) = e23b87003814dd6e7e17924bd1f53989a5008dd1da07baa23c40d2a18dc1ab2d786d61e2c304b3f60e73be5f180ae2deea3b4499c0157b6afe3c9273d2f739f6