diff --git a/encoding-fix-metadata.diff b/encoding-fix-metadata.diff index 218467b..085a34d 100644 --- a/encoding-fix-metadata.diff +++ b/encoding-fix-metadata.diff @@ -1,5 +1,5 @@ ---- encoding-0.2.33/Cargo.toml 2016-08-28T18:53:46+02:00 -+++ encoding-0.2.33/Cargo.toml 2018-11-03T15:01:55.026063+01:00 +--- encoding-0.2.33/Cargo.toml 2016-08-28T16:53:46+00:00 ++++ encoding-0.2.33/Cargo.toml 2019-06-23T09:01:31.586509+00:00 @@ -10,6 +10,7 @@ keywords = ["encoding", "unicode", "charset"] readme = "README.md" diff --git a/rust-encoding.spec b/rust-encoding.spec index dee81a6..bf2446e 100644 --- a/rust-encoding.spec +++ b/rust-encoding.spec @@ -1,36 +1,31 @@ -# Generated by rust2rpm -# Tests require nightly compiler -%bcond_with check +# Generated by rust2rpm 10 +%bcond_without check %global debug_package %{nil} %global crate encoding Name: rust-%{crate} Version: 0.2.33 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Character encoding support for Rust +# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/encoding -Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate +Source: %{crates_source} # Initial patched metadata # * No paths Patch0: encoding-fix-metadata.diff ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -BuildRequires: (crate(encoding-index-japanese/default) >= 1.20141219.5 with crate(encoding-index-japanese/default) < 1.20141220.0) -BuildRequires: (crate(encoding-index-korean/default) >= 1.20141219.5 with crate(encoding-index-korean/default) < 1.20141220.0) -BuildRequires: (crate(encoding-index-simpchinese/default) >= 1.20141219.5 with crate(encoding-index-simpchinese/default) < 1.20141220.0) -BuildRequires: (crate(encoding-index-singlebyte/default) >= 1.20141219.5 with crate(encoding-index-singlebyte/default) < 1.20141220.0) -BuildRequires: (crate(encoding-index-tradchinese/default) >= 1.20141219.5 with crate(encoding-index-tradchinese/default) < 1.20141220.0) -%if %{with check} -BuildRequires: (crate(getopts/default) >= 0.2.0 with crate(getopts/default) < 0.3.0) -%endif -%global _description \ -Character encoding support for Rust. +%global _description %{expand: +Character encoding support for Rust.} %description %{_description} @@ -61,9 +56,12 @@ which use "default" feature of "%{crate}" crate. %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep -%autosetup -n %{crate}-%{version} -p1 +%autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep +%generate_buildrequires +%cargo_generate_buildrequires + %build %cargo_build @@ -76,6 +74,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Sun Jun 23 11:01:31 CEST 2019 Igor Gnatenko - 0.2.33-7 +- Regenerate + * Sat Feb 02 2019 Fedora Release Engineering - 0.2.33-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild 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..f4e1fd9 --- /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-encoding