From 011b32890dddfb4d9f6e1f53a2a65778129cd483 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 5 Feb 2022 13:29:53 +0100 Subject: [PATCH] Update to version 4.6.3; Fixes RHBZ#2050963 --- .gitignore | 1 + combine-fix-metadata.diff | 37 +++++------- rust-combine.spec | 117 ++++++++++++++++++++++---------------- sources | 2 +- 4 files changed, 85 insertions(+), 72 deletions(-) diff --git a/.gitignore b/.gitignore index cef06a3..64a4c3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /combine-4.6.0.crate +/combine-4.6.3.crate diff --git a/combine-fix-metadata.diff b/combine-fix-metadata.diff index 7db5717..c6ff976 100644 --- a/combine-fix-metadata.diff +++ b/combine-fix-metadata.diff @@ -1,5 +1,5 @@ ---- combine-4.6.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ combine-4.6.0/Cargo.toml 2021-07-15T04:42:50.866403+00:00 +--- combine-4.6.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ combine-4.6.3/Cargo.toml 2022-02-05T11:26:30.337832+00:00 @@ -106,12 +106,6 @@ default-features = false package = "tokio" @@ -13,29 +13,20 @@ [dependencies.tokio-dep] version = "1" optional = true -@@ -139,7 +133,7 @@ - version = "1.0" - - [dev-dependencies.partial-io] --version = "0.3" -+version = "0.5" - features = ["tokio", "quickcheck"] - - [dev-dependencies.quick-error] -@@ -151,11 +145,6 @@ - [dev-dependencies.tokio-02-dep] - version = "0.2" +@@ -159,11 +153,6 @@ features = ["fs", "io-driver", "io-util", "macros"] --package = "tokio" -- + package = "tokio" + -[dev-dependencies.tokio-03-dep] -version = "0.3" -features = ["fs", "macros", "rt-multi-thread"] - package = "tokio" - +-package = "tokio" +- [dev-dependencies.tokio-dep] -@@ -175,4 +164,3 @@ - std = ["memchr/use_std", "bytes"] - tokio = ["tokio-dep", "futures-util-03", "pin-project-lite"] - tokio-02 = ["pin-project", "std", "tokio-02-dep", "futures-util-03", "pin-project-lite", "bytes_05"] --tokio-03 = ["pin-project", "std", "tokio-03-dep", "futures-util-03", "pin-project-lite"] + version = "1" + features = ["fs", "macros", "rt", "rt-multi-thread", "io-util"] +@@ -178,4 +167,3 @@ + std = ["memchr/use_std", "bytes", "alloc"] + tokio = ["tokio-dep", "tokio-util/io", "futures-core-03", "pin-project-lite"] + tokio-02 = ["pin-project", "std", "tokio-02-dep", "futures-core-03", "pin-project-lite", "bytes_05"] +-tokio-03 = ["pin-project", "std", "tokio-03-dep", "futures-core-03", "pin-project-lite"] diff --git a/rust-combine.spec b/rust-combine.spec index 75b7c2d..740c353 100644 --- a/rust-combine.spec +++ b/rust-combine.spec @@ -1,11 +1,12 @@ -# Generated by rust2rpm 18 -%bcond_without check +# Generated by rust2rpm 20 +# * tests rely on missing or removed dev-dependencies +%bcond_with check %global debug_package %{nil} %global crate combine Name: rust-%{crate} -Version: 4.6.0 +Version: 4.6.3 Release: %autorelease Summary: Fast parser combinators on arbitrary streams with zero-copy support @@ -13,15 +14,11 @@ Summary: Fast parser combinators on arbitrary streams with zero-copy supp License: MIT URL: https://crates.io/crates/combine Source: %{crates_source} -# Bump partial-io to 0.5, drop tokio-03 feature and its dependencies +# Initial patched metadata +# * drop features and dependencies for tokio 0.3 Patch0: combine-fix-metadata.diff -# Drop logic for tokio-03 in a test -Patch1: combine-drop-tokio-03.patch ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -36,12 +33,12 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel %license LICENSE -%doc examples README.md CHANGELOG.md examples/readme.rs benches/http-requests.txt +%doc CHANGELOG.md README.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel @@ -50,20 +47,32 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+alloc-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+alloc-devel %{_description} + +This package contains library source intended for building other packages which +use the "alloc" feature of the "%{crate}" crate. + +%files -n %{name}+alloc-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %package -n %{name}+bytes-devel Summary: %{summary} BuildArch: noarch %description -n %{name}+bytes-devel %{_description} -This package contains library source intended for building other packages -which use "bytes" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "bytes" feature of the "%{crate}" crate. %files -n %{name}+bytes-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -74,8 +83,8 @@ BuildArch: noarch %description -n %{name}+bytes_05-devel %{_description} -This package contains library source intended for building other packages -which use "bytes_05" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "bytes_05" feature of the "%{crate}" crate. %files -n %{name}+bytes_05-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -86,34 +95,34 @@ BuildArch: noarch %description -n %{name}+futures-03-devel %{_description} -This package contains library source intended for building other packages -which use "futures-03" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "futures-03" feature of the "%{crate}" crate. %files -n %{name}+futures-03-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+futures-io-03-devel +%package -n %{name}+futures-core-03-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+futures-io-03-devel %{_description} +%description -n %{name}+futures-core-03-devel %{_description} -This package contains library source intended for building other packages -which use "futures-io-03" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "futures-core-03" feature of the "%{crate}" crate. -%files -n %{name}+futures-io-03-devel +%files -n %{name}+futures-core-03-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+futures-util-03-devel +%package -n %{name}+futures-io-03-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+futures-util-03-devel %{_description} +%description -n %{name}+futures-io-03-devel %{_description} -This package contains library source intended for building other packages -which use "futures-util-03" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "futures-io-03" feature of the "%{crate}" crate. -%files -n %{name}+futures-util-03-devel +%files -n %{name}+futures-io-03-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+mp4-devel @@ -122,8 +131,8 @@ BuildArch: noarch %description -n %{name}+mp4-devel %{_description} -This package contains library source intended for building other packages -which use "mp4" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "mp4" feature of the "%{crate}" crate. %files -n %{name}+mp4-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -134,8 +143,8 @@ BuildArch: noarch %description -n %{name}+pin-project-devel %{_description} -This package contains library source intended for building other packages -which use "pin-project" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "pin-project" feature of the "%{crate}" crate. %files -n %{name}+pin-project-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -146,8 +155,8 @@ BuildArch: noarch %description -n %{name}+pin-project-lite-devel %{_description} -This package contains library source intended for building other packages -which use "pin-project-lite" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "pin-project-lite" feature of the "%{crate}" crate. %files -n %{name}+pin-project-lite-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -158,8 +167,8 @@ 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. +This package contains library source intended for building other packages which +use the "regex" feature of the "%{crate}" crate. %files -n %{name}+regex-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -170,8 +179,8 @@ BuildArch: noarch %description -n %{name}+std-devel %{_description} -This package contains library source intended for building other packages -which use "std" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -182,8 +191,8 @@ BuildArch: noarch %description -n %{name}+tokio-devel %{_description} -This package contains library source intended for building other packages -which use "tokio" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "tokio" feature of the "%{crate}" crate. %files -n %{name}+tokio-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -194,8 +203,8 @@ BuildArch: noarch %description -n %{name}+tokio-02-devel %{_description} -This package contains library source intended for building other packages -which use "tokio-02" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "tokio-02" feature of the "%{crate}" crate. %files -n %{name}+tokio-02-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -206,8 +215,8 @@ BuildArch: noarch %description -n %{name}+tokio-02-dep-devel %{_description} -This package contains library source intended for building other packages -which use "tokio-02-dep" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "tokio-02-dep" feature of the "%{crate}" crate. %files -n %{name}+tokio-02-dep-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -218,12 +227,24 @@ BuildArch: noarch %description -n %{name}+tokio-dep-devel %{_description} -This package contains library source intended for building other packages -which use "tokio-dep" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "tokio-dep" feature of the "%{crate}" crate. %files -n %{name}+tokio-dep-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+tokio-util-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+tokio-util-devel %{_description} + +This package contains library source intended for building other packages which +use the "tokio-util" feature of the "%{crate}" crate. + +%files -n %{name}+tokio-util-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep diff --git a/sources b/sources index 706bd28..45d9f11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (combine-4.6.0.crate) = 1cece5ceb47e35bc0afa10a199f600d01326fb3594b6fac81ab3abbdaa3977db148b47a38daf9fdc7abb1bb9873c40ba38a4e1760285b589677d24c079b17983 +SHA512 (combine-4.6.3.crate) = 495f9703efc2b9271dad2fdd2626aa9a1843fd3e10e63d0c8b9e42d4c7e3137a4740aa476c0206ad8dbf2683d0eeafde36f70581bdeb30299fa08e077f9183f3