From b92078eee51c43e14b09fb2e7bd2fb28c22708c4 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 1 Jul 2022 19:39:57 +0200 Subject: [PATCH] Adapt %cargo_prep macro to fix builds with Rust 1.62+ Starting with Rust 1.62, cargo fails if Cargo.toml.orig already exists, so it needs to be removed in %cargo_prep. --- ...uum-up-Cargo.toml.orig-in-addition-t.patch | 27 +++++++++++++++++++ rust-packaging.spec | 1 + 2 files changed, 28 insertions(+) create mode 100644 0005-macros.cargo-vacuum-up-Cargo.toml.orig-in-addition-t.patch diff --git a/0005-macros.cargo-vacuum-up-Cargo.toml.orig-in-addition-t.patch b/0005-macros.cargo-vacuum-up-Cargo.toml.orig-in-addition-t.patch new file mode 100644 index 0000000..5c0e45f --- /dev/null +++ b/0005-macros.cargo-vacuum-up-Cargo.toml.orig-in-addition-t.patch @@ -0,0 +1,27 @@ +From 98638813aa1e085e05092ebfcbcad7ce7fd00a44 Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +Date: Fri, 1 Jul 2022 19:29:56 +0200 +Subject: [PATCH] macros.cargo: vacuum up Cargo.toml.orig in addition to + Cargo.lock + +This fixes builds with cargo from Rust 1.62+, which now complains +and fails our builds if the Cargo.toml.orig file already exists. +--- + data/macros.cargo | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/macros.cargo b/data/macros.cargo +index 344b44e..206df14 100644 +--- a/data/macros.cargo ++++ b/data/macros.cargo +@@ -44,6 +44,7 @@ registry = "https://crates.io"\ + replace-with = "local-registry"\ + EOF\ + %{__rm} -f Cargo.lock \ ++%{__rm} -f Cargo.toml.orig \ + ) + + %__cargo_parse_opts(naf:) %{shrink:\ +-- +2.36.1 + diff --git a/rust-packaging.spec b/rust-packaging.spec index 11ffad4..84b4f87 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -15,6 +15,7 @@ Patch: 0001-Add-comment-about-unused-macro.patch Patch: 0002-Allow-easy-overriding-of-the-opt-level-debuginfo-cod.patch Patch: 0003-Fix-autodetection-of-rpmautospec.patch Patch: 0004-Print-information-about-written-files.patch +Patch: 0005-macros.cargo-vacuum-up-Cargo.toml.orig-in-addition-t.patch ExclusiveArch: %{rust_arches}