From c76059028dfeba846e23ae65f1ae474db9adb5ee Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 9 Sep 2022 20:17:27 +0200 Subject: [PATCH] Drop unused "ps" binary which conflicts with procps-ng --- nu-system-fix-metadata.diff | 14 ++++++++++++++ rust-nu-system.spec | 16 +++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 nu-system-fix-metadata.diff diff --git a/nu-system-fix-metadata.diff b/nu-system-fix-metadata.diff new file mode 100644 index 0000000..035f749 --- /dev/null +++ b/nu-system-fix-metadata.diff @@ -0,0 +1,14 @@ +--- nu-system-0.65.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ nu-system-0.65.0/Cargo.toml 2022-09-09T18:13:15.313848+00:00 +@@ -19,10 +19,7 @@ + ] + description = "Nushell system querying" + license = "MIT" +- +-[[bin]] +-name = "ps" +-path = "src/main.rs" ++autobins = false + + [dependencies] + diff --git a/rust-nu-system.spec b/rust-nu-system.spec index 924df16..1e647b0 100644 --- a/rust-nu-system.spec +++ b/rust-nu-system.spec @@ -1,5 +1,6 @@ # Generated by rust2rpm 22 %bcond_without check +%global debug_package %{nil} %global crate nu-system @@ -13,6 +14,12 @@ URL: https://crates.io/crates/nu-system Source: %{crates_source} # Automatically generated patch to strip foreign dependencies Patch: nu-system-fix-metadata-auto.diff +# Manually created patch for downstream crate metadata changes +# * drop "ps" binary which conflicts with procps-ng +Patch: nu-system-fix-metadata.diff + +# ensure that the broken nu-system package can never be installed +Obsoletes: nu-system < 0.65.0-3 ExclusiveArch: %{rust_arches} @@ -23,15 +30,6 @@ Nushell system querying.} %description %{_description} -%package -n %{crate} -Summary: %{summary} - -%description -n %{crate} %{_description} - -%files -n %{crate} -%license LICENSE -%{_bindir}/ps - %package devel Summary: %{summary} BuildArch: noarch