diff --git a/.gitignore b/.gitignore index b5aa1c7..68995ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/bstr-1.11.0.crate +SOURCES/bstr-1.11.3.crate diff --git a/.rust-bstr.metadata b/.rust-bstr.metadata index 3b6a71f..1f808bf 100644 --- a/.rust-bstr.metadata +++ b/.rust-bstr.metadata @@ -1 +1 @@ -5063406722a78c6db04b612367fe2b991e1abc44 SOURCES/bstr-1.11.0.crate +6506d6c5cddd8b629c5ce3bdaa43bbd6bbd7af01 SOURCES/bstr-1.11.3.crate diff --git a/SOURCES/bstr-fix-metadata.diff b/SOURCES/bstr-fix-metadata.diff deleted file mode 100644 index 879b0fc..0000000 --- a/SOURCES/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/SOURCES/rust2rpm.toml b/SOURCES/rust2rpm.toml new file mode 100644 index 0000000..cb5c621 --- /dev/null +++ b/SOURCES/rust2rpm.toml @@ -0,0 +1,4 @@ +[tests] +run = ["doc"] +comments = ["test data for unit tests is not included in published crates"] + diff --git a/SPECS/rust-bstr.spec b/SPECS/rust-bstr.spec index e22ce55..e2ae6e3 100644 --- a/SPECS/rust-bstr.spec +++ b/SPECS/rust-bstr.spec @@ -15,17 +15,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 @@ -47,7 +43,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}/ @@ -126,14 +121,18 @@ 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 +## START: Generated by rpmautospec +* Fri Jan 03 2025 Fabio Valentini - 1.11.3-1 +- Update to version 1.11.3; Fixes RHBZ#2331714 + * Fri Dec 20 2024 MSVSphere Packaging Team - 1.11.0-1 - Rebuilt for MSVSphere 10 -## START: Generated by rpmautospec * Wed Dec 04 2024 Fabio Valentini - 1.11.0-1 - Update to version 1.11.0; Fixes RHBZ#2326142