From 09a5436a9afa8ec4c43bc47572da20f1ce72675d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 9 Mar 2019 15:31:09 +0100 Subject: [PATCH] Adapt to new packaging Signed-off-by: Igor Gnatenko --- rust-sys-info.spec | 51 ++++++++++++++++++++++++++++----------------- tests/.fmf/version | 1 + tests/provision.fmf | 5 +++++ tests/tests.yml | 13 ++++++++++++ 4 files changed, 51 insertions(+), 19 deletions(-) create mode 100644 tests/.fmf/version create mode 100644 tests/provision.fmf create mode 100644 tests/tests.yml diff --git a/rust-sys-info.spec b/rust-sys-info.spec index db9169d..93e9f0e 100644 --- a/rust-sys-info.spec +++ b/rust-sys-info.spec @@ -1,43 +1,58 @@ # Generated by rust2rpm -%bcond_without check +%bcond_with check %global debug_package %{nil} %global crate sys-info Name: rust-%{crate} Version: 0.5.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Get system information in Rust License: MIT URL: https://crates.io/crates/sys-info -Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate +Source: %{crates_source} ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(libc) >= 0.2.29 with crate(libc) < 0.3.0) -# [build-dependencies] -BuildRequires: (crate(cc) >= 1.0.0 with crate(cc) < 2.0.0) -BuildRequires: %{_bindir}/hostname +BuildRequires: (crate(cc/default) >= 1.0.0 with crate(cc/default) < 2.0.0) +BuildRequires: (crate(libc/default) >= 0.2.29 with crate(libc/default) < 0.3.0) -%description -%{summary}. +%global _description \ +Get system information in Rust. + +%description %{_description} %package devel Summary: %{summary} Requires: %{_bindir}/hostname BuildArch: noarch -%description devel -Get system information in 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 +%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 @@ -56,12 +71,10 @@ which use %{crate} from crates.io. %endif %endif -%files devel -%license LICENSE -%doc README.md -%{cargo_registry}/%{crate}-%{version}/ - %changelog +* Sat Mar 09 2019 Igor Gnatenko - 0.5.6-5 +- Adapt to new packaging + * Sat Feb 02 2019 Fedora Release Engineering - 0.5.6-4 - 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..b72ad22 --- /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-sys-info