From cd09fd7fb6e1226b2c3b942292b6386134a07b3d Mon Sep 17 00:00:00 2001 From: jxy_git Date: Thu, 30 Oct 2025 16:38:26 +0800 Subject: [PATCH] Fix compilation failures caused by rust-packaging (cherry picked from commit da274aac0d3f2a4c4ac874bdd309948dd1251239) --- nispor.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/nispor.spec b/nispor.spec index 721c2b9..c0ea968 100644 --- a/nispor.spec +++ b/nispor.spec @@ -2,30 +2,28 @@ %global __cargo_skip_build 0 Name: nispor Version: 1.0.1 -Release: 5 +Release: 6 Summary: Unified interface for Linux network state querying License: ASL 2.0 URL: https://github.com/nispor/nispor Source: https://github.com/nispor/nispor/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: Enable-debug-symbols.patch ExclusiveArch: aarch64 x86_64 riscv64 loongarch64 -BuildRequires: make pkg-config python3-devel systemd-devel openEuler-rpm-config -BuildRequires: rust-packaging < 24 -Conflicts: cargo-rpm-macros +BuildRequires: make pkg-config python3-devel rust-packaging systemd-devel openEuler-rpm-config %description Unified interface for Linux network state querying. %package -n python3-%{name} Summary: %{summary} -Requires: nispor = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: nispor = %{version}-%{release} BuildArch: noarch %description -n python3-%{name} This package contains python3 binding of %{name}. %package devel Summary: %{summary} -Requires: nispor%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: nispor = %{version}-%{release} %description devel This package contains C binding of %{name}. @@ -102,6 +100,9 @@ rm -rf %{buildroot}%{cargo_registry}/%{name}-%{version}/ %{_libdir}/pkgconfig/nispor.pc %changelog +* Thu Oct 30 2025 jiangxinyu - 1.0.1-6 +- Fix compilation failures caused by rust-packaging + * Thu Apr 17 2025 jiangxinyu - 1.0.1-5 - Limit rust-packaging version -- Gitee