From c00f2a77c049730753d6cb4570733bece614020d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 2 Nov 2023 16:50:32 +0100 Subject: [PATCH] Update to version 0.20.0; Fixes RHBZ#2189358 --- .gitignore | 1 + lalrpop-fix-metadata.diff | 32 ++++++++++++++++++-------------- rust-lalrpop.spec | 17 ++++++++--------- sources | 2 +- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 8bbd301..511bde3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /lalrpop-0.19.8.crate /lalrpop-0.19.9.crate /lalrpop-0.19.12.crate +/lalrpop-0.20.0.crate diff --git a/lalrpop-fix-metadata.diff b/lalrpop-fix-metadata.diff index 1b71cdc..ef6f93d 100644 --- a/lalrpop-fix-metadata.diff +++ b/lalrpop-fix-metadata.diff @@ -1,6 +1,6 @@ ---- lalrpop-0.19.12/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ lalrpop-0.19.12/Cargo.toml 2023-06-04T17:50:07.579330+00:00 -@@ -26,16 +26,13 @@ +--- lalrpop-0.20.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ lalrpop-0.20.0/Cargo.toml 2023-11-02T15:10:45.569041+00:00 +@@ -28,16 +28,13 @@ categories = ["parsing"] license = "Apache-2.0 OR MIT" repository = "https://github.com/lalrpop/lalrpop" @@ -18,19 +18,23 @@ [dependencies.ascii-canvas] version = "3.0" -@@ -68,14 +65,9 @@ - version = "0.6" - default_features = false +@@ -68,11 +65,6 @@ --[dependencies.pico-args] --version = "0.4" --optional = true + [dependencies.petgraph] + version = "0.6" -default_features = false - - [dependencies.regex] - version = "1" --features = ["std"] -+features = ["std", "perf"] +-[dependencies.pico-args] +-version = "0.5" +-optional = true default_features = false - [dependencies.regex-syntax] + [dependencies.regex] +@@ -107,7 +99,6 @@ + default = [ + "lexer", + "unicode", +- "pico-args", + ] + lexer = ["lalrpop-util/lexer"] + unicode = [ diff --git a/rust-lalrpop.spec b/rust-lalrpop.spec index 44d7f1d..6865df4 100644 --- a/rust-lalrpop.spec +++ b/rust-lalrpop.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate lalrpop Name: rust-lalrpop -Version: 0.19.12 +Version: 0.20.0 Release: %autorelease Summary: Convenient LR(1) parser generator @@ -16,11 +16,10 @@ Source0: %{crates_source} Source1: https://github.com/lalrpop/lalrpop/raw/%{version}/LICENSE-APACHE Source2: https://github.com/lalrpop/lalrpop/raw/%{version}/LICENSE-MIT # Manually created patch for downstream crate metadata changes -# * add missing dependency on "regex/perf" # * prevent unused lalrpop binary from being built and shipped Patch: lalrpop-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Convenient LR(1) parser generator.} @@ -65,20 +64,20 @@ use the "lexer" feature of the "%{crate}" crate. %files -n %{name}+lexer-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+test-devel +%package -n %{name}+unicode-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+test-devel %{_description} +%description -n %{name}+unicode-devel %{_description} This package contains library source intended for building other packages which -use the "test" feature of the "%{crate}" crate. +use the "unicode" feature of the "%{crate}" crate. -%files -n %{name}+test-devel +%files -n %{name}+unicode-devel %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 cp -pav %{SOURCE1} %{SOURCE2} . %cargo_prep diff --git a/sources b/sources index eb852ca..218cced 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lalrpop-0.19.12.crate) = 024acbeae8379bbdd170e7afdc674453bcc997e5fecb745fa77d45a689814317d920e544872611eac6fdaf949a0696d32f9362746e370c0eb81d75e19d2f8b98 +SHA512 (lalrpop-0.20.0.crate) = 78607f89874e8b17649af353760477ccb31e8f9d88f799119de686a198065163378a32d34c372e456bab184dad2a63ec62d651dd88d66914b5d8f42f3c28547a