diff --git a/plist-fix-metadata.diff b/plist-fix-metadata.diff index c08da30..52fd5ed 100644 --- a/plist-fix-metadata.diff +++ b/plist-fix-metadata.diff @@ -1,5 +1,5 @@ --- plist-0.3.0/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ plist-0.3.0/Cargo.toml 2018-09-03T08:59:02.257027+02:00 ++++ plist-0.3.0/Cargo.toml 2018-11-03T15:27:40.071803+01:00 @@ -34,7 +34,7 @@ optional = true diff --git a/rust-plist.spec b/rust-plist.spec index 39424f5..5f224dd 100644 --- a/rust-plist.spec +++ b/rust-plist.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 plist Name: rust-%{crate} Version: 0.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Rusty plist parser License: MIT @@ -21,29 +22,57 @@ Patch0001: 0001-Update-xml-rs-to-0.8.0-reimplement-plist-prologue.patch ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(base64) >= 0.9.0 with crate(base64) < 0.10.0) -BuildRequires: (crate(byteorder) >= 1.1.0 with crate(byteorder) < 2.0.0) -BuildRequires: (crate(humantime) >= 1.1.1 with crate(humantime) < 2.0.0) -BuildRequires: (crate(serde) >= 1.0.2 with crate(serde) < 2.0.0) -BuildRequires: (crate(xml-rs) >= 0.8.0 with crate(xml-rs) < 0.9.0) +BuildRequires: (crate(base64/default) >= 0.9.0 with crate(base64/default) < 0.10.0) +BuildRequires: (crate(byteorder/default) >= 1.1.0 with crate(byteorder/default) < 2.0.0) +BuildRequires: (crate(humantime/default) >= 1.1.1 with crate(humantime/default) < 2.0.0) +BuildRequires: (crate(serde/default) >= 1.0.2 with crate(serde/default) < 2.0.0) +BuildRequires: (crate(xml-rs/default) >= 0.8.0 with crate(xml-rs/default) < 0.9.0) %if %{with check} -# [dev-dependencies] -BuildRequires: (crate(serde_derive) >= 1.0.2 with crate(serde_derive) < 2.0.0) +BuildRequires: (crate(serde_derive/default) >= 1.0.2 with crate(serde_derive/default) < 2.0.0) %endif -%description -%{summary}. +%global _description \ +A rusty plist parser. Supports Serde serialization. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -A rusty plist parser. Supports Serde serialization. +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%license LICENCE +%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 %{crate} from crates.io. +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+serde-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+serde-devel %{_description} + +This package contains library source intended for building other packages +which use "serde" feature of "%{crate}" crate. + +%files -n %{name}+serde-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep %autosetup -n %{crate}-%{version} -p1 @@ -60,11 +89,9 @@ which use %{crate} from crates.io. %cargo_test %endif -%files devel -%license LICENCE -%doc README.md -%{cargo_registry}/%{crate}-%{version}/ - %changelog +* Sat Nov 03 2018 Igor Gnatenko - 0.3.0-2 +- Adapt to new packaging + * Mon Sep 03 2018 Igor Gnatenko - 0.3.0-1 - Initial package 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..691648e --- /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-plist