From 3a84d4175e611678777d74faf1d6a671c402a0cb Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 7 Aug 2023 15:37:21 +0200 Subject: [PATCH] Regenerate with rust2rpm v24; fix build failure on RHEL 9 kernels --- ...etadata.diff => nix-fix-metadata-auto.diff | 2 +- rust-nix0.22.spec | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) rename nix-fix-metadata.diff => nix-fix-metadata-auto.diff (85%) diff --git a/nix-fix-metadata.diff b/nix-fix-metadata-auto.diff similarity index 85% rename from nix-fix-metadata.diff rename to nix-fix-metadata-auto.diff index 2c79124..4781687 100644 --- a/nix-fix-metadata.diff +++ b/nix-fix-metadata-auto.diff @@ -1,5 +1,5 @@ --- nix-0.22.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ nix-0.22.3/Cargo.toml 2022-04-24T17:52:24.531875+00:00 ++++ nix-0.22.3/Cargo.toml 2023-08-07T13:33:52.588924+00:00 @@ -73,7 +73,3 @@ version = "0.5.1" [target."cfg(not(target_os = \"redox\"))".dependencies.memoffset] diff --git a/rust-nix0.22.spec b/rust-nix0.22.spec index 975163d..32a70dc 100644 --- a/rust-nix0.22.spec +++ b/rust-nix0.22.spec @@ -1,26 +1,21 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate nix -Name: rust-%{crate}0.22 +Name: rust-nix0.22 Version: 0.22.3 Release: %autorelease Summary: Rust friendly bindings to *nix APIs -# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/nix Source: %{crates_source} -# Initial patched metadata -# * drop DragonflyBSD/FreeBSD-specific dependencies -Patch0: nix-fix-metadata.diff - +# Automatically generated patch to strip foreign dependencies +Patch: nix-fix-metadata-auto.diff # * upstream patch to fix doctests with Rust 1.62+ -Patch1: https://github.com/nix-rust/nix/commit/0ac338b.patch - -ExclusiveArch: %{rust_arches} +Patch: https://github.com/nix-rust/nix/commit/0ac338b.patch BuildRequires: rust-packaging >= 21 @@ -73,8 +68,8 @@ use the "default" feature of the "%{crate}" crate. %if %{with check} %check -# skip a test that tends to hang in systemd-nspawn environments -%cargo_test -- -- --skip sys::test_socket::test_af_alg_aead +# * skip tests that hang or fail in the build environment +%cargo_test -- -- --skip sys::test_socket::test_af_alg_aead -- skip sys::test_socket::test_vsock %endif %changelog