From be45b3a4c2d5bc242bb8b313f09e63490d03f1e2 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 13 Dec 2022 00:04:58 +0100 Subject: [PATCH] Update to version 0.6.28; Fixes RHBZ#2140337 --- .gitignore | 1 + regex-syntax-fix-metadata.diff | 11 +++++++++++ rust-regex-syntax.spec | 17 +++++++++-------- sources | 2 +- 4 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 regex-syntax-fix-metadata.diff diff --git a/.gitignore b/.gitignore index b7a0f5e..0ad835b 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /regex-syntax-0.6.25.crate /regex-syntax-0.6.26.crate /regex-syntax-0.6.27.crate +/regex-syntax-0.6.28.crate diff --git a/regex-syntax-fix-metadata.diff b/regex-syntax-fix-metadata.diff new file mode 100644 index 0000000..96f01f3 --- /dev/null +++ b/regex-syntax-fix-metadata.diff @@ -0,0 +1,11 @@ +--- regex-syntax-0.6.28/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ regex-syntax-0.6.28/Cargo.toml 2022-12-12T22:56:26.918309+00:00 +@@ -18,7 +18,7 @@ + homepage = "https://github.com/rust-lang/regex" + documentation = "https://docs.rs/regex-syntax" + readme = "README.md" +-license = "MIT OR Apache-2.0" ++license = "(MIT OR Apache-2.0) AND Unicode-DFS-2016" + repository = "https://github.com/rust-lang/regex" + + [features] diff --git a/rust-regex-syntax.spec b/rust-regex-syntax.spec index c6c334f..5656866 100644 --- a/rust-regex-syntax.spec +++ b/rust-regex-syntax.spec @@ -1,20 +1,21 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate regex-syntax -Name: rust-%{crate} -Version: 0.6.27 +Name: rust-regex-syntax +Version: 0.6.28 Release: %autorelease Summary: Regular expression parser -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: (MIT OR Apache-2.0) AND Unicode-DFS-2016 URL: https://crates.io/crates/regex-syntax Source: %{crates_source} - -ExclusiveArch: %{rust_arches} +# Manually created patch for downstream crate metadata changes +# * add missing Unicode license terms to crate metadata: +# https://github.com/rust-lang/regex/discussions/933 +Patch: regex-syntax-fix-metadata.diff BuildRequires: rust-packaging >= 21 @@ -35,9 +36,9 @@ use the "%{crate}" crate. %files devel %license %{crate_instdir}/LICENSE-APACHE %license %{crate_instdir}/LICENSE-MIT +%license %{crate_instdir}/src/unicode_tables/LICENSE-UNICODE %doc %{crate_instdir}/README.md %{crate_instdir}/ -%exclude %{crate_instdir}/test %package -n %{name}+default-devel Summary: %{summary} diff --git a/sources b/sources index c6c6fe9..8dba246 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (regex-syntax-0.6.27.crate) = 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6 +SHA512 (regex-syntax-0.6.28.crate) = ba5fb1622a330b67a4eb820551c7f20dbfdc6b38eb697b9bfddea4cf0060b473472045e93aaf6cb9727ae609e06ed285e1e42f06f34ac730ac39fb90425bbe85