From 90093697113b8b7641f0692cbb13a9db64a74961 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Wed, 8 May 2024 20:21:26 +0200
Subject: [PATCH] Update to version 0.1.12; Fixes RHBZ#2277433

---
 .gitignore                      |  1 +
 rust-unicode-width.spec         | 23 +++++------------------
 rust2rpm.conf                   |  7 -------
 rust2rpm.toml                   | 14 ++++++++++++++
 sources                         |  2 +-
 unicode-width-fix-metadata.diff |  6 +++---
 6 files changed, 24 insertions(+), 29 deletions(-)
 delete mode 100644 rust2rpm.conf
 create mode 100644 rust2rpm.toml

diff --git a/.gitignore b/.gitignore
index 49d8cbf..0a6029c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /unicode-width-0.1.9.crate
 /unicode-width-0.1.10.crate
 /unicode-width-0.1.11.crate
+/unicode-width-0.1.12.crate
diff --git a/rust-unicode-width.spec b/rust-unicode-width.spec
index 0e6ee29..b22f5ed 100644
--- a/rust-unicode-width.spec
+++ b/rust-unicode-width.spec
@@ -1,15 +1,14 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 26
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate unicode-width
 
 Name:           rust-unicode-width
-Version:        0.1.11
+Version:        0.1.12
 Release:        %autorelease
-Summary:        Determine displayed width of `char` and `str` types
+Summary:        Determine displayed width of 'char' and 'str' types
 
-# Upstream license specification: MIT/Apache-2.0
 License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/unicode-width
 Source:         %{crates_source}
@@ -17,7 +16,7 @@ Source:         %{crates_source}
 # * exclude scripts that are only useful for upstream development
 Patch:          unicode-width-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Determine displayed width of `char` and `str` types according to Unicode
@@ -53,18 +52,6 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+bench-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+bench-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "bench" feature of the "%{crate}" crate.
-
-%files       -n %{name}+bench-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+no_std-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -78,7 +65,7 @@ use the "no_std" 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/rust2rpm.conf b/rust2rpm.conf
deleted file mode 100644
index b2481ab..0000000
--- a/rust2rpm.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-summary = Determine displayed width of `char` and `str` types
-unwanted-features =
-  compiler_builtins
-  core
-  std
-  rustc-dep-of-std
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..5100dd7
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,14 @@
+[package]
+summary = "Determine displayed width of 'char' and 'str' types"
+cargo-toml-patch-comments = [
+    "exclude scripts that are only useful for upstream development",
+]
+
+[features]
+hide = [
+    "compiler_builtins",
+    "core",
+    "std",
+    "rustc-dep-of-std",
+]
+
diff --git a/sources b/sources
index d8b1bdf..964b462 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (unicode-width-0.1.11.crate) = ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe
+SHA512 (unicode-width-0.1.12.crate) = 0bafd7a69bdf49c849e7c063ebf0487eca8a76244e3bc18c9a5f4609465dc0e5d482daceb6a9a6f4125b801bf7063cb8225fdb55173e5dc55e7bf278300df1b4
diff --git a/unicode-width-fix-metadata.diff b/unicode-width-fix-metadata.diff
index 3ff4323..e1cd500 100644
--- a/unicode-width-fix-metadata.diff
+++ b/unicode-width-fix-metadata.diff
@@ -1,6 +1,6 @@
---- unicode-width-0.1.11/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ unicode-width-0.1.11/Cargo.toml	2023-09-19T19:23:32.582543+00:00
-@@ -19,6 +19,7 @@
+--- unicode-width-0.1.12/Cargo.toml	1970-01-01T00:00:01+00:00
++++ unicode-width-0.1.12/Cargo.toml	2024-05-08T18:18:48.311229+00:00
+@@ -20,6 +20,7 @@
  exclude = [
      "target/*",
      "Cargo.lock",