From e8c2916738de3bf973b207a6c3eded7076ea8180 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 18 Jan 2023 12:13:10 -0600 Subject: [PATCH] Per upstream suggestion, back out PR 8164 instead of adding regex-syntax Signed-off-by: Michel Alexandre Salim --- below-common-fix-metadata.diff | 18 ++++++++++-------- rust-below-common.spec | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/below-common-fix-metadata.diff b/below-common-fix-metadata.diff index 2bb35fc..70bdd87 100644 --- a/below-common-fix-metadata.diff +++ b/below-common-fix-metadata.diff @@ -1,5 +1,5 @@ --- below-common-0.6.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ below-common-0.6.3/Cargo.toml 2023-01-18T16:43:18.137715+00:00 ++++ below-common-0.6.3/Cargo.toml 2023-01-18T18:12:10.289873+00:00 @@ -35,7 +35,7 @@ default-features = false @@ -9,13 +9,15 @@ features = ["crossterm-backend"] default-features = false -@@ -53,6 +53,9 @@ - ] - default-features = false +@@ -47,11 +47,6 @@ + + [dependencies.regex] + version = "1.5.4" +-features = [ +- "std", +- "unicode-perl", +-] +-default-features = false -+[dependencies.regex-syntax] -+version = "0.6" -+ [dependencies.slog] version = "2.7" - features = [ diff --git a/rust-below-common.spec b/rust-below-common.spec index 28a2add..64be639 100644 --- a/rust-below-common.spec +++ b/rust-below-common.spec @@ -14,7 +14,7 @@ URL: https://crates.io/crates/below-common Source: %{crates_source} # Manually created patch for downstream crate metadata changes # - bump cursive to 0.20 -# - explicitly require regex-syntax +# - restore use of regex default features (back out https://github.com/facebookincubator/below/pull/8164) Patch: below-common-fix-metadata.diff BuildRequires: rust-packaging >= 21