From 5a8d3428ee3c00593893a248efb44174716b86cf Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 3 Jan 2025 16:42:07 +0100
Subject: [PATCH] Update to version 1.11.3; Fixes RHBZ#2331714

---
 .gitignore             |  1 +
 bstr-fix-metadata.diff | 11 -----------
 rust-bstr.spec         | 12 ++++--------
 rust2rpm.toml          |  4 ++++
 sources                |  2 +-
 5 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 bstr-fix-metadata.diff
 create mode 100644 rust2rpm.toml

diff --git a/.gitignore b/.gitignore
index f51c34c..6d18c29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /bstr-1.9.1.crate
 /bstr-1.10.0.crate
 /bstr-1.11.0.crate
+/bstr-1.11.3.crate
diff --git a/bstr-fix-metadata.diff b/bstr-fix-metadata.diff
deleted file mode 100644
index 879b0fc..0000000
--- a/bstr-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- bstr-1.11.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ bstr-1.11.0/Cargo.toml	2024-12-04T22:38:17.432115+00:00
-@@ -40,7 +40,7 @@
-     "text-processing",
-     "encoding",
- ]
--license = "MIT OR Apache-2.0"
-+license = "(MIT OR Apache-2.0) AND Unicode-DFS-2016"
- repository = "https://github.com/BurntSushi/bstr"
- resolver = "2"
- 
diff --git a/rust-bstr.spec b/rust-bstr.spec
index 3cb1b2f..59b2047 100644
--- a/rust-bstr.spec
+++ b/rust-bstr.spec
@@ -5,17 +5,13 @@
 %global crate bstr
 
 Name:           rust-bstr
-Version:        1.11.0
+Version:        1.11.3
 Release:        %autorelease
 Summary:        String type that is not required to be valid UTF-8
 
-License:        (MIT OR Apache-2.0) AND Unicode-DFS-2016
+License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/bstr
 Source:         %{crates_source}
-# Manually created patch for downstream crate metadata changes
-# * add missing Unicode license terms to crate metadata:
-#   https://github.com/BurntSushi/bstr/issues/129
-Patch:          bstr-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
 
@@ -37,7 +33,6 @@ use the "%{crate}" crate.
 %license %{crate_instdir}/COPYING
 %license %{crate_instdir}/LICENSE-APACHE
 %license %{crate_instdir}/LICENSE-MIT
-%license %{crate_instdir}/src/unicode/data/LICENSE-UNICODE
 %doc %{crate_instdir}/README.md
 %{crate_instdir}/
 
@@ -116,7 +111,8 @@ use the "unicode" feature of the "%{crate}" crate.
 
 %if %{with check}
 %check
-%cargo_test
+# * test data for unit tests is not included in published crates
+%cargo_test -- --doc
 %endif
 
 %changelog
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..cb5c621
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,4 @@
+[tests]
+run = ["doc"]
+comments = ["test data for unit tests is not included in published crates"]
+
diff --git a/sources b/sources
index ed00ca2..061a8c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bstr-1.11.0.crate) = e4534db9f27184134264dfb16ffc79b7d2374e79ef50400cee4cf44c1e9d7d0b9f7ab8fa034493b5a1ef835c797214bfb399ae95d4b670b3283180fded414ba9
+SHA512 (bstr-1.11.3.crate) = f1082ac8f121c6f9eab4b41c5f60aafe4623696c9f800f9d59f6726efc74f86071910f7749fbcdc8f1c20c83416d58f3ff507978775f602e18ae3d1bb027944d