diff --git a/.gitignore b/.gitignore index 4aa1b6e..e61cb20 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pretty_assertions-0.5.1.crate +/pretty_assertions-0.6.1.crate diff --git a/pretty_assertions-fix-metadata.diff b/pretty_assertions-fix-metadata.diff new file mode 100644 index 0000000..95356a9 --- /dev/null +++ b/pretty_assertions-fix-metadata.diff @@ -0,0 +1,13 @@ +--- pretty_assertions-0.6.1/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ pretty_assertions-0.6.1/Cargo.toml 2019-02-23T10:49:56.328708+01:00 +@@ -27,10 +27,5 @@ + + [dependencies.difference] + version = "2.0.0" +-[target."cfg(windows)".dependencies.ctor] +-version = "0.1.7" +- +-[target."cfg(windows)".dependencies.output_vt100] +-version = "0.1.2" + [badges.travis-ci] + repository = "colin-kiegel/rust-pretty-assertions" diff --git a/rust-pretty_assertions.spec b/rust-pretty_assertions.spec index e72d1da..128de9b 100644 --- a/rust-pretty_assertions.spec +++ b/rust-pretty_assertions.spec @@ -1,42 +1,62 @@ # Generated by rust2rpm -%bcond_without check +%bcond_with check %global debug_package %{nil} %global crate pretty_assertions Name: rust-%{crate} -Version: 0.5.1 -Release: 2%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: Overwrite `assert_eq!` and `assert_ne!` with colorful diffs # Upstream license specification: MIT/Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/pretty_assertions -Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate +Source: %{crates_source} +# Initial patched metadata +# * No windows +Patch0: pretty_assertions-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(ansi_term) >= 0.11.0 with crate(ansi_term) < 0.12.0) -BuildRequires: (crate(difference) >= 2.0.0 with crate(difference) < 3.0.0) +BuildRequires: (crate(ansi_term/default) >= 0.11.0 with crate(ansi_term/default) < 0.12.0) +BuildRequires: (crate(difference/default) >= 2.0.0 with crate(difference/default) < 3.0.0) -%description -%{summary}. +%global _description \ +Overwrite `assert_eq!` and `assert_ne!` with drop-in replacements, adding\ +colorful diffs. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -Overwrite `assert_eq!` and `assert_ne!` with drop-in replacements, adding -colorful diffs. +%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 +%autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep %build @@ -50,12 +70,10 @@ which use %{crate} from crates.io. %cargo_test %endif -%files devel -%license LICENSE-MIT LICENSE-APACHE -%doc README.md -%{cargo_registry}/%{crate}-%{version}/ - %changelog +* Sat Feb 23 2019 Igor Gnatenko - 0.6.1-1 +- Update to 0.6.1 + * Sat Feb 02 2019 Fedora Release Engineering - 0.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 4b09a36..a5caa89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pretty_assertions-0.5.1.crate) = 400fa9b69a8ca494ff95171d7163138a46a5078a11ab7f08b7b3e3e57cf18f0867f18ef08af4641d2be7e28e6084f4ef11e139a4febe9fd7847ceb34d78263c2 +SHA512 (pretty_assertions-0.6.1.crate) = 10010c6e6b02098def38a8e6cbfe34fd052fe5773628d57a8141c7933f868906870158b4d4b1948b752d2c5f7b2981806d5f835e125aa2447d408415ba764f71 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..1183eb2 --- /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-pretty_assertions