From ca5fff1925d08cd32a936a472f78557f2f5ba4cc Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 14 Dec 2019 09:52:17 +0100 Subject: [PATCH] Update to 0.3.1 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + futures-fix-metadata.diff | 74 ----------- rust-futures.spec | 251 +++++++++++++++++++++++++++----------- sources | 2 +- tests/.fmf/version | 1 + tests/provision.fmf | 5 + tests/tests.yml | 13 ++ 7 files changed, 203 insertions(+), 144 deletions(-) delete mode 100644 futures-fix-metadata.diff create mode 100644 tests/.fmf/version create mode 100644 tests/provision.fmf create mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore index c0cded7..d09b61b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /futures-0.1.21.crate /futures-0.2.1.crate /futures-0.2.2.crate +/futures-0.3.1.crate diff --git a/futures-fix-metadata.diff b/futures-fix-metadata.diff deleted file mode 100644 index c70fc62..0000000 --- a/futures-fix-metadata.diff +++ /dev/null @@ -1,74 +0,0 @@ ---- futures-preview-0.2.2/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ futures-preview-0.2.2/Cargo.toml 2018-09-11T07:42:47.547354+02:00 -@@ -11,7 +11,7 @@ - # will likely look very different (and much more reasonable) - - [package] --name = "futures-preview" -+name = "futures" - version = "0.2.2" - authors = ["Alex Crichton "] - description = "An implementation of futures and streams featuring zero allocations,\ncomposability, and iterator-like interfaces.\n" -@@ -25,50 +25,50 @@ - - [lib] - name = "futures" --[dependencies.futures-async-runtime-preview] -+[dependencies.futures-async-runtime] - version = "0.2.2" - default-features = false - --[dependencies.futures-channel-preview] -+[dependencies.futures-channel] - version = "0.2.2" - default-features = false - --[dependencies.futures-core-preview] -+[dependencies.futures-core] - version = "0.2.2" - default-features = false - --[dependencies.futures-executor-preview] -+[dependencies.futures-executor] - version = "0.2.2" - default-features = false - --[dependencies.futures-io-preview] -+[dependencies.futures-io] - version = "0.2.2" - default-features = false - --[dependencies.futures-macro-async-preview] -+[dependencies.futures-macro-async] - version = "0.2.2" - optional = true - --[dependencies.futures-macro-await-preview] -+[dependencies.futures-macro-await] - version = "0.2.2" - optional = true - --[dependencies.futures-sink-preview] -+[dependencies.futures-sink] - version = "0.2.2" - default-features = false - --[dependencies.futures-stable-preview] -+[dependencies.futures-stable] - version = "0.2.2" - default-features = false - --[dependencies.futures-util-preview] -+[dependencies.futures-util] - version = "0.2.2" - default-features = false - - [features] - default = ["std"] --nightly = ["futures-core-preview/nightly", "futures-stable-preview/nightly", "futures-async-runtime-preview/nightly", "futures-macro-async-preview", "futures-macro-await-preview", "futures-macro-async-preview/nightly"] --std = ["futures-core-preview/std", "futures-executor-preview/std", "futures-io-preview/std", "futures-sink-preview/std", "futures-stable-preview/std", "futures-util-preview/std", "futures-async-runtime-preview/std"] -+nightly = ["futures-core/nightly", "futures-stable/nightly", "futures-async-runtime/nightly", "futures-macro-async", "futures-macro-await", "futures-macro-async/nightly"] -+std = ["futures-core/std", "futures-executor/std", "futures-io/std", "futures-sink/std", "futures-stable/std", "futures-util/std", "futures-async-runtime/std"] - [badges.appveyor] - repository = "rust-lang-nursery/futures-rs" - diff --git a/rust-futures.spec b/rust-futures.spec index a1cfaca..55b4466 100644 --- a/rust-futures.spec +++ b/rust-futures.spec @@ -1,107 +1,220 @@ -# Generated by rust2rpm +# Generated by rust2rpm 12 %bcond_without check %global debug_package %{nil} %global crate futures -%global real_crate futures-preview Name: rust-%{crate} -Version: 0.2.2 -Release: 2%{?dist} -Summary: Implementation of futures and streams featuring zero allocations +Version: 0.3.1 +Release: 1%{?dist} +Summary: Implementation of futures and streams -# Upstream license specification: MIT/Apache-2.0 +# Upstream license specification: MIT OR Apache-2.0 License: MIT or ASL 2.0 -URL: https://crates.io/crates/futures-preview -Source0: https://crates.io/api/v1/crates/%{real_crate}/%{version}/download#/%{crate}-%{version}.crate -# Initial patched metadata -# * Remove -preview suffix -Patch0: futures-fix-metadata.diff +URL: https://crates.io/crates/futures +Source: %{crates_source} ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(futures-async-runtime) >= 0.2.2 with crate(futures-async-runtime) < 0.3.0) -BuildRequires: (crate(futures-channel) >= 0.2.2 with crate(futures-channel) < 0.3.0) -BuildRequires: (crate(futures-core) >= 0.2.2 with crate(futures-core) < 0.3.0) -BuildRequires: (crate(futures-executor) >= 0.2.2 with crate(futures-executor) < 0.3.0) -BuildRequires: (crate(futures-io) >= 0.2.2 with crate(futures-io) < 0.3.0) -BuildRequires: (crate(futures-macro-async) >= 0.2.2 with crate(futures-macro-async) < 0.3.0) -BuildRequires: (crate(futures-macro-await) >= 0.2.2 with crate(futures-macro-await) < 0.3.0) -BuildRequires: (crate(futures-sink) >= 0.2.2 with crate(futures-sink) < 0.3.0) -BuildRequires: (crate(futures-stable) >= 0.2.2 with crate(futures-stable) < 0.3.0) -BuildRequires: (crate(futures-util) >= 0.2.2 with crate(futures-util) < 0.3.0) - -%description -%{summary}. + +%global _description %{expand: +Implementation of futures and streams featuring zero allocations, +composability, and iterator-like interfaces.} + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -An implementation of futures and streams featuring zero allocations, -composability, and iterator-like interfaces. +%description devel %{_description} This package contains library source intended for building other packages -which use %{crate} from crates.io. +which use "%{crate}" crate. -%prep -%autosetup -n %{real_crate}-%{version} -p1 -%cargo_prep +%files devel +%license LICENSE-APACHE LICENSE-MIT +%doc README.md +%{cargo_registry}/%{crate}-%{version_no_tilde}/ -%build -%cargo_build +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch -%install -%cargo_install +%description -n %{name}+default-devel %{_description} -%if %{with check} -%check -%cargo_test -%endif +This package contains library source intended for building other packages +which use "default" feature of "%{crate}" crate. -%files devel -%license LICENSE-MIT LICENSE-APACHE -%{cargo_registry}/%{crate}-%{version}/ +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%changelog -* Sat Feb 02 2019 Fedora Release Engineering - 0.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +%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 "alloc" feature of "%{crate}" crate. + +%files -n %{name}+alloc-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+async-await-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+async-await-devel %{_description} + +This package contains library source intended for building other packages +which use "async-await" feature of "%{crate}" crate. + +%files -n %{name}+async-await-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+bilock-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+bilock-devel %{_description} + +This package contains library source intended for building other packages +which use "bilock" feature of "%{crate}" crate. + +%files -n %{name}+bilock-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+cfg-target-has-atomic-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+cfg-target-has-atomic-devel %{_description} + +This package contains library source intended for building other packages +which use "cfg-target-has-atomic" feature of "%{crate}" crate. + +%files -n %{name}+cfg-target-has-atomic-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+compat-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+compat-devel %{_description} + +This package contains library source intended for building other packages +which use "compat" feature of "%{crate}" crate. + +%files -n %{name}+compat-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -* Tue Sep 11 2018 Igor Gnatenko - 0.2.2-1 -- Update to 0.2.2 +%package -n %{name}+executor-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+executor-devel %{_description} + +This package contains library source intended for building other packages +which use "executor" feature of "%{crate}" crate. + +%files -n %{name}+executor-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+futures-executor-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+futures-executor-devel %{_description} + +This package contains library source intended for building other packages +which use "futures-executor" feature of "%{crate}" crate. + +%files -n %{name}+futures-executor-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+io-compat-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+io-compat-devel %{_description} + +This package contains library source intended for building other packages +which use "io-compat" feature of "%{crate}" crate. + +%files -n %{name}+io-compat-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+read-initializer-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+read-initializer-devel %{_description} + +This package contains library source intended for building other packages +which use "read-initializer" feature of "%{crate}" crate. + +%files -n %{name}+read-initializer-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -* Sat Jul 14 2018 Fedora Release Engineering - 0.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +%package -n %{name}+std-devel +Summary: %{summary} +BuildArch: noarch -* Sun Jul 01 2018 Igor Gnatenko - 0.2.1-3 -- Stop ignoring test suite +%description -n %{name}+std-devel %{_description} + +This package contains library source intended for building other packages +which use "std" feature of "%{crate}" crate. + +%files -n %{name}+std-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+thread-pool-devel +Summary: %{summary} +BuildArch: noarch -* Fri Jun 29 2018 Igor Gnatenko - 0.2.1-2 -- Fix build +%description -n %{name}+thread-pool-devel %{_description} -* Fri May 25 2018 Igor Gnatenko - 0.2.1-1 -- Update to 0.2.1 +This package contains library source intended for building other packages +which use "thread-pool" feature of "%{crate}" crate. -* Tue Apr 03 2018 Josh Stone - 0.1.21-1 -- Update to 0.1.21 +%files -n %{name}+thread-pool-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -* Fri Mar 23 2018 Josh Stone - 0.1.19-1 -- Update to 0.1.19 +%package -n %{name}+unstable-devel +Summary: %{summary} +BuildArch: noarch -* Fri Feb 09 2018 Fedora Release Engineering - 0.1.18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +%description -n %{name}+unstable-devel %{_description} -* Fri Jan 26 2018 Igor Gnatenko - 0.1.18-2 -- Stop running useless chmod +This package contains library source intended for building other packages +which use "unstable" feature of "%{crate}" crate. -* Fri Jan 26 2018 Josh Stone - 0.1.18-1 -- Update to 0.1.18 +%files -n %{name}+unstable-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -* Mon Jan 08 2018 Igor Gnatenko - 0.1.17-2 -- Rebuild for rust-packaging v5 +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep -* Thu Jun 15 2017 Igor Gnatenko - 0.1.14-1 +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +* Sat Dec 14 09:51:49 CET 2019 Igor Gnatenko - 0.3.1-1 - Initial package diff --git a/sources b/sources index e0c8f8c..c51e134 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (futures-0.2.2.crate) = f305cd45b2fae752f0997826d7c9cf0f1384d0d4b68ab7a8d5396d370635ecf75d3a81ca9db59f66071dff817dcb36139b24f06baf3456670fa10321bdc7b2d5 +SHA512 (futures-0.3.1.crate) = 89f2bfd875debd4ac9e355d588f9b129d0a0c7f82b163f7f68f07de183546e4ee4c174e5d01fa6605cdb78b66f65ec63973bb11327f25b51fd67ba83f49958fb diff --git a/tests/.fmf/version b/tests/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/provision.fmf b/tests/provision.fmf new file mode 100644 index 0000000..503a97c --- /dev/null +++ b/tests/provision.fmf @@ -0,0 +1,5 @@ +--- +standard-inventory-qcow2: + qemu: + # `cargo test` usually eats more than 1G. + m: 4G diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..57fb8a2 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,13 @@ +--- +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + repositories: + - repo: "https://src.fedoraproject.org/tests/rust.git" + dest: rust + tests: + - rust/cargo-test + environment: + pkg: rust-futures