From 7b170dd8c9ca2dcfd5ddbf55b0e0a819ba4ee445 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Aug 09 2021 12:16:41 +0000 Subject: Update to version 6.2.1; Fixes RHBZ#1973966 --- diff --git a/.gitignore b/.gitignore index dc19b36..2988124 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /nom-5.1.2.crate /nom-6.1.0.crate /nom-6.1.2.crate +/nom-6.2.1.crate diff --git a/nom-fix-metadata.diff b/nom-fix-metadata.diff index d1ea999..c86c944 100644 --- a/nom-fix-metadata.diff +++ b/nom-fix-metadata.diff @@ -1,5 +1,5 @@ ---- nom-6.1.2/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ nom-6.1.2/Cargo.toml 2021-02-20T09:19:53.875757+00:00 +--- nom-6.2.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ nom-6.2.1/Cargo.toml 2021-08-09T10:42:27.661933+00:00 @@ -34,21 +34,6 @@ [lib] @@ -63,7 +63,20 @@ [dependencies.bitvec] version = "0.19.3" optional = true -@@ -176,8 +127,6 @@ +@@ -164,20 +115,15 @@ + optional = true + + [dependencies.memchr] +-version = ">=2.0, <2.4" ++version = "2.0" + default-features = false + + [dependencies.regex] + version = "^1.0" + optional = true +-[dev-dependencies.criterion] +-version = "0.3" +- [dev-dependencies.doc-comment] version = "0.3" diff --git a/rust-nom.spec b/rust-nom.spec index 752e626..910b678 100644 --- a/rust-nom.spec +++ b/rust-nom.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 16 +# Generated by rust2rpm 18 %bcond_without check %global debug_package %{nil} %global crate nom Name: rust-%{crate} -Version: 6.1.2 +Version: 6.2.1 Release: %autorelease Summary: Byte-oriented, zero-copy, parser combinators library @@ -14,8 +14,10 @@ License: MIT URL: https://crates.io/crates/nom Source: %{crates_source} # Initial patched metadata +# * relax memchr dependency range (MSRV is not relevant for Fedora) # * drop benchmarks and examples not shipped with the crate -# * drop optional jemallocator dev-dependency (not packaged) +# * drop criterion dev-dependency (used only in benchmarks) +# * drop unused optional jemallocator dev-dependency Patch0: nom-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -41,7 +43,7 @@ which use "%{crate}" crate. %files devel %license LICENSE -%doc README.md CHANGELOG.md +%doc doc README.md CHANGELOG.md doc/nom_recipes.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel @@ -196,15 +198,9 @@ which use "std" feature of "%{crate}" crate. # https://github.com/Geal/nom/issues/1278 %cargo_test -- -- --skip issue_848_overflow_incomplete_bits_to_bytes %else -%ifarch aarch64 -# skip doctests when rustdoc fails to compile tests on aarch64 -# https://bugzilla.redhat.com/show_bug.cgi?id=1902663 -%cargo_test -- --lib -%else %cargo_test %endif %endif -%endif %changelog %autochangelog diff --git a/sources b/sources index 5528574..fdd1003 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nom-6.1.2.crate) = f9a12a6c523c1c3202f3c45a514d02c40c600c835b83a1f94fd8e51ab462fdb89de3b32ad11630813d8e3cf4c8bc76acc620781568dbf2eb12469dcd9d3d0b19 +SHA512 (nom-6.2.1.crate) = d881cb1162b5e5752931ea40b7806c628e08733960d20d739c7527785de507f76c4a0b041d1072c4f2c137083a2da982cf9f371fa822896d6092a1a5bda34f46