From fd6fee258bbbd811c60c0580471568ab7ddf4371 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 20 Jun 2019 12:35:42 +0200 Subject: [PATCH] Regenerate Signed-off-by: Igor Gnatenko --- libz-sys-fix-metadata.diff | 16 ++++++---------- rust-libz-sys.spec | 29 +++++++++++++++++------------ tests/.fmf/version | 1 + tests/provision.fmf | 5 +++++ tests/tests.yml | 13 +++++++++++++ 5 files changed, 42 insertions(+), 22 deletions(-) create mode 100644 tests/.fmf/version create mode 100644 tests/provision.fmf create mode 100644 tests/tests.yml diff --git a/libz-sys-fix-metadata.diff b/libz-sys-fix-metadata.diff index 2240126..08e7475 100644 --- a/libz-sys-fix-metadata.diff +++ b/libz-sys-fix-metadata.diff @@ -1,12 +1,8 @@ ---- libz-sys-1.0.25/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ libz-sys-1.0.25/Cargo.toml 2018-11-04T17:39:46.882431+01:00 -@@ -28,9 +28,3 @@ - - [build-dependencies.pkg-config] - version = "0.3.9" -- --[features] --asm = [] --static = [] +--- libz-sys-1.0.25/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ libz-sys-1.0.25/Cargo.toml 2019-06-20T10:34:11.327023+00:00 +@@ -32,5 +32,3 @@ + [features] + asm = [] + static = [] -[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] -version = "0.2" diff --git a/rust-libz-sys.spec b/rust-libz-sys.spec index 5dc6346..aaa3d52 100644 --- a/rust-libz-sys.spec +++ b/rust-libz-sys.spec @@ -1,33 +1,31 @@ -# Generated by rust2rpm -%bcond_with check +# Generated by rust2rpm 10 +%bcond_without check %global debug_package %{nil} %global crate libz-sys Name: rust-%{crate} Version: 1.0.25 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Bindings to the system libz library (also known as zlib) # Upstream license specification: MIT/Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/libz-sys -Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate +Source: %{crates_source} # Initial patched metadata -# * the asm and static features are only for the bundled lib # * No MSVC Patch0: libz-sys-fix-metadata.diff ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -BuildRequires: (crate(cc/default) >= 1.0.18 with crate(cc/default) < 2.0.0) -BuildRequires: (crate(libc/default) >= 0.2.43 with crate(libc/default) < 0.3.0) -BuildRequires: (crate(pkg-config/default) >= 0.3.9 with crate(pkg-config/default) < 0.4.0) -BuildRequires: pkgconfig(zlib) -%global _description \ -Bindings to the system libz library (also known as zlib). +%global _description %{expand: +Bindings to the system libz library (also known as zlib).} %description %{_description} @@ -59,11 +57,15 @@ 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 # No bundled libs rm -vrf src/zlib/ %cargo_prep +%generate_buildrequires +%cargo_generate_buildrequires +echo 'pkgconfig(zlib)' + %build %cargo_build @@ -76,6 +78,9 @@ rm -vrf src/zlib/ %endif %changelog +* Thu Jun 20 12:34:11 CEST 2019 Igor Gnatenko - 1.0.25-5 +- Regenerate + * Sat Feb 02 2019 Fedora Release Engineering - 1.0.25-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..8d85d80 --- /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-libz-sys