From b58729c5055f96b83af7aeea0f90a30a10511e97 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 23 Oct 2025 20:42:53 +0800 Subject: [PATCH] add conflicts on older version of cargo-rpm-macros (cherry picked from commit e8cdaa8eafdadf6d637425620ad6463c61e1b166) --- rust.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index bdf8228..8cf2358 100644 --- a/rust.spec +++ b/rust.spec @@ -26,7 +26,7 @@ Name: rust Version: 1.90.0 -Release: 1 +Release: 2 Summary: The Rust Programming Language License: Apache-2.0 OR MIT URL: https://www.rust-lang.org @@ -217,6 +217,7 @@ BuildRequires: git Requires: %{name} = %{version}-%{release} Obsoletes: cargo-vendor <= 0.1.23 Provides: cargo-vendor = %{version}-%{release} +Conflicts: cargo-rpm-macros < 1:23 %description -n cargo Cargo is a tool that allows Rust projects to declare their various dependencies and ensure that you'll always get a repeatable build. @@ -557,6 +558,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Thu Oct 23 2025 Funda Wang - 1.90.0-2 +- add conflicts on older version of cargo-rpm-macros + * Thu Sep 25 2025 jchzhou - 1.90.0-1 - Update to 1.90.0 -- Gitee