diff --git a/.gitignore b/.gitignore index dbb411a..8bbd301 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /lalrpop-0.19.7.crate /lalrpop-0.19.8.crate /lalrpop-0.19.9.crate +/lalrpop-0.19.12.crate diff --git a/lalrpop-fix-metadata.diff b/lalrpop-fix-metadata.diff index 27ccc69..1b71cdc 100644 --- a/lalrpop-fix-metadata.diff +++ b/lalrpop-fix-metadata.diff @@ -1,6 +1,6 @@ ---- lalrpop-0.19.9/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ lalrpop-0.19.9/Cargo.toml 2023-03-26T17:38:08.111063+00:00 -@@ -26,6 +26,7 @@ +--- 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 @@ categories = ["parsing"] license = "Apache-2.0 OR MIT" repository = "https://github.com/lalrpop/lalrpop" @@ -8,3 +8,29 @@ [package.metadata.docs.rs] features = ["lexer"] + + [lib] + doctest = false +- +-[[bin]] +-name = "lalrpop" +-required-features = ["pico-args"] + + [dependencies.ascii-canvas] + version = "3.0" +@@ -68,14 +65,9 @@ + version = "0.6" + default_features = false + +-[dependencies.pico-args] +-version = "0.4" +-optional = true +-default_features = false +- + [dependencies.regex] + version = "1" +-features = ["std"] ++features = ["std", "perf"] + default_features = false + + [dependencies.regex-syntax] diff --git a/rust-lalrpop.spec b/rust-lalrpop.spec index 8421be8..44d7f1d 100644 --- a/rust-lalrpop.spec +++ b/rust-lalrpop.spec @@ -5,7 +5,7 @@ %global crate lalrpop Name: rust-lalrpop -Version: 0.19.9 +Version: 0.19.12 Release: %autorelease Summary: Convenient LR(1) parser generator @@ -16,7 +16,8 @@ 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 -# * drop unused lalrpop binary +# * add missing dependency on "regex/perf" +# * prevent unused lalrpop binary from being built and shipped Patch: lalrpop-fix-metadata.diff BuildRequires: rust-packaging >= 21 @@ -64,18 +65,6 @@ use the "lexer" feature of the "%{crate}" crate. %files -n %{name}+lexer-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+pico-args-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+pico-args-devel %{_description} - -This package contains library source intended for building other packages which -use the "pico-args" feature of the "%{crate}" crate. - -%files -n %{name}+pico-args-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+test-devel Summary: %{summary} BuildArch: noarch diff --git a/sources b/sources index 4b68ffb..eb852ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lalrpop-0.19.9.crate) = 29cc324fe252a8a5c2e7b46d804f1d0fd978ebdb256e0af9749ae96f56ef24ad9555275a86c3d07b563b4a3eb23c97abf7b37bc83d09eef4da8ea1cd913686a5 +SHA512 (lalrpop-0.19.12.crate) = 024acbeae8379bbdd170e7afdc674453bcc997e5fecb745fa77d45a689814317d920e544872611eac6fdaf949a0696d32f9362746e370c0eb81d75e19d2f8b98