From dd427539515def2de764115c0ded7061324a56c8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 29 Aug 2021 00:00:33 +0200 Subject: [PATCH] Update to version 7.0.0; Fixes RHBZ#1996271 --- .gitignore | 1 + README.md | 3 -- nom-fix-metadata.diff | 35 ++++++----------- rust-nom.spec | 89 +------------------------------------------ sources | 2 +- 5 files changed, 15 insertions(+), 115 deletions(-) delete mode 100644 README.md diff --git a/.gitignore b/.gitignore index 2988124..b264179 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /nom-6.1.0.crate /nom-6.1.2.crate /nom-6.2.1.crate +/nom-7.0.0.crate diff --git a/README.md b/README.md deleted file mode 100644 index 67e0401..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-nom - -The rust-nom package \ No newline at end of file diff --git a/nom-fix-metadata.diff b/nom-fix-metadata.diff index c86c944..d49fc79 100644 --- a/nom-fix-metadata.diff +++ b/nom-fix-metadata.diff @@ -1,6 +1,6 @@ ---- 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 @@ +--- nom-7.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ nom-7.0.0/Cargo.toml 2021-08-22T10:19:56.584131+00:00 +@@ -33,21 +33,6 @@ [lib] bench = false @@ -22,7 +22,7 @@ [[test]] name = "arithmetic" -@@ -111,40 +96,6 @@ +@@ -101,49 +86,15 @@ name = "fnmut" required-features = ["alloc"] @@ -47,11 +47,6 @@ -harness = false - -[[bench]] --name = "ini_complete" --path = "benches/ini_complete.rs" --harness = false -- --[[bench]] -name = "ini_str" -path = "benches/ini_str.rs" -harness = false @@ -60,28 +55,20 @@ -name = "json" -path = "benches/json.rs" -harness = false - [dependencies.bitvec] - version = "0.19.3" - optional = true -@@ -164,20 +115,15 @@ - optional = true - [dependencies.memchr] --version = ">=2.0, <2.4" -+version = "2.0" + version = "2.0" default-features = false - [dependencies.regex] - version = "^1.0" - optional = true + [dependencies.minimal-lexical] + version = "0.1.2" -[dev-dependencies.criterion] -version = "0.3" -- + [dev-dependencies.doc-comment] version = "0.3" - +- -[dev-dependencies.jemallocator] -version = "^0.3" - [build-dependencies.version_check] - version = "0.9" + [dev-dependencies.proptest] + version = "1.0.0" diff --git a/rust-nom.spec b/rust-nom.spec index 910b678..e5d217e 100644 --- a/rust-nom.spec +++ b/rust-nom.spec @@ -5,7 +5,7 @@ %global crate nom Name: rust-%{crate} -Version: 6.2.1 +Version: 7.0.0 Release: %autorelease Summary: Byte-oriented, zero-copy, parser combinators library @@ -14,7 +14,6 @@ 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 criterion dev-dependency (used only in benchmarks) # * drop unused optional jemallocator dev-dependency @@ -43,7 +42,7 @@ which use "%{crate}" crate. %files devel %license LICENSE -%doc doc README.md CHANGELOG.md doc/nom_recipes.md +%doc README.md CHANGELOG.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel @@ -70,18 +69,6 @@ which use "alloc" feature of "%{crate}" crate. %files -n %{name}+alloc-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+bitvec-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+bitvec-devel %{_description} - -This package contains library source intended for building other packages -which use "bitvec" feature of "%{crate}" crate. - -%files -n %{name}+bitvec-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - %package -n %{name}+docsrs-devel Summary: %{summary} BuildArch: noarch @@ -94,78 +81,6 @@ which use "docsrs" feature of "%{crate}" crate. %files -n %{name}+docsrs-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+funty-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+funty-devel %{_description} - -This package contains library source intended for building other packages -which use "funty" feature of "%{crate}" crate. - -%files -n %{name}+funty-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+lazy_static-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+lazy_static-devel %{_description} - -This package contains library source intended for building other packages -which use "lazy_static" feature of "%{crate}" crate. - -%files -n %{name}+lazy_static-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+lexical-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+lexical-devel %{_description} - -This package contains library source intended for building other packages -which use "lexical" feature of "%{crate}" crate. - -%files -n %{name}+lexical-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+lexical-core-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+lexical-core-devel %{_description} - -This package contains library source intended for building other packages -which use "lexical-core" feature of "%{crate}" crate. - -%files -n %{name}+lexical-core-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+regex-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+regex-devel %{_description} - -This package contains library source intended for building other packages -which use "regex" feature of "%{crate}" crate. - -%files -n %{name}+regex-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+regexp-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+regexp-devel %{_description} - -This package contains library source intended for building other packages -which use "regexp" feature of "%{crate}" crate. - -%files -n %{name}+regexp-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - %package -n %{name}+std-devel Summary: %{summary} BuildArch: noarch diff --git a/sources b/sources index fdd1003..cd992fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nom-6.2.1.crate) = d881cb1162b5e5752931ea40b7806c628e08733960d20d739c7527785de507f76c4a0b041d1072c4f2c137083a2da982cf9f371fa822896d6092a1a5bda34f46 +SHA512 (nom-7.0.0.crate) = 7f640071cd5b1870255a7182580cc94f24e69eeae06b1a1f193e91e26c1b01bf46c8baac56fdf220191ec50bf7994ef125ae1991d4c4659d0d8f7809552313f9