diff --git a/rust-yaml-rust.spec b/rust-yaml-rust.spec index eece7a4..58d677c 100644 --- a/rust-yaml-rust.spec +++ b/rust-yaml-rust.spec @@ -1,12 +1,13 @@ # Generated by rust2rpm -%bcond_without check +# * Tests are run in infrastructure +%bcond_with check %global debug_package %{nil} %global crate yaml-rust Name: rust-%{crate} Version: 0.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.2 parser for rust # Upstream license specification: MIT/Apache-2.0 @@ -17,25 +18,41 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(linked-hash-map) >= 0.0.9 with crate(linked-hash-map) < 0.6.0) +BuildRequires: (crate(linked-hash-map/default) >= 0.0.9 with crate(linked-hash-map/default) < 0.6.0) %if %{with check} -# [dev-dependencies] -BuildRequires: (crate(quickcheck) >= 0.7.0 with crate(quickcheck) < 0.8.0) +BuildRequires: (crate(quickcheck/default) >= 0.7.0 with crate(quickcheck/default) < 0.8.0) %endif -%description -%{summary}. +%global _description \ +The missing YAML 1.2 parser for rust. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -The missing YAML 1.2 parser for rust. +%description devel %{_description} This package contains library source intended for building other packages -which use %{crate} from crates.io. +which use "%{crate}" crate. + +%files devel +%license LICENSE-MIT LICENSE-APACHE +%doc README.md +%{cargo_registry}/%{crate}-%{version}/ + +%package -n %{name}+default-devel +Summary: %{summary} +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. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep %autosetup -n %{crate}-%{version} -p1 @@ -54,13 +71,10 @@ chmod -x tests/specs/cpp2rust.rb %cargo_test %endif -%files devel -%license LICENSE-MIT LICENSE-APACHE -%doc README.md -%{cargo_registry}/%{crate}-%{version}/ -%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml - %changelog +* Sat Nov 03 2018 Igor Gnatenko - 0.4.2-2 +- Adapt to new packaging + * Mon Sep 17 2018 Josh Stone - 0.4.2-1 - Update to 0.4.2 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..95ed520 --- /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-yaml-rust