已开启
[sync] PR-21: Fix compilation failures caused by rust-packaging #22
AtomGit-Bot创建于 2025年10月31日
[sync] PR-21: Fix compilation failures caused by rust-packaging #22
已开启
共 1 个文件变更+7-6
| @@ -2,30 +2,28 @@ | |||
| 2 | %global __cargo_skip_build 0 | 2 | %global __cargo_skip_build 0 |
| 3 | Name: nispor | 3 | Name: nispor |
| 4 | Version: 1.0.1 | 4 | Version: 1.0.1 |
| 5 | -Release: 5 | 5 | +Release: 6 |
| 6 | Summary: Unified interface for Linux network state querying | 6 | Summary: Unified interface for Linux network state querying |
| 7 | License: ASL 2.0 | 7 | License: ASL 2.0 |
| 8 | URL: https://github.com/nispor/nispor | 8 | URL: https://github.com/nispor/nispor |
| 9 | Source: https://github.com/nispor/nispor/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz | 9 | Source: https://github.com/nispor/nispor/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz |
| 10 | Patch0: Enable-debug-symbols.patch | 10 | Patch0: Enable-debug-symbols.patch |
| 11 | ExclusiveArch: aarch64 x86_64 riscv64 loongarch64 | 11 | ExclusiveArch: aarch64 x86_64 riscv64 loongarch64 |
| 12 | -BuildRequires: make pkg-config python3-devel systemd-devel openEuler-rpm-config | 12 | +BuildRequires: make pkg-config python3-devel rust-packaging systemd-devel openEuler-rpm-config |
| 13 | -BuildRequires: rust-packaging < 24 | ||
| 14 | -Conflicts: cargo-rpm-macros | ||
| 15 | 13 | ||
| 16 | %description | 14 | %description |
| 17 | Unified interface for Linux network state querying. | 15 | Unified interface for Linux network state querying. |
| 18 | 16 | ||
| 19 | %package -n python3-%{name} | 17 | %package -n python3-%{name} |
| 20 | Summary: %{summary} | 18 | Summary: %{summary} |
| 21 | -Requires: nispor = %{?epoch:%{epoch}:}%{version}-%{release} | 19 | +Requires: nispor = %{version}-%{release} |
| 22 | BuildArch: noarch | 20 | BuildArch: noarch |
| 23 | %description -n python3-%{name} | 21 | %description -n python3-%{name} |
| 24 | This package contains python3 binding of %{name}. | 22 | This package contains python3 binding of %{name}. |
| 25 | 23 | ||
| 26 | %package devel | 24 | %package devel |
| 27 | Summary: %{summary} | 25 | Summary: %{summary} |
| 28 | -Requires: nispor%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} | 26 | +Requires: nispor = %{version}-%{release} |
| 29 | %description devel | 27 | %description devel |
| 30 | This package contains C binding of %{name}. | 28 | This package contains C binding of %{name}. |
| 31 | 29 | ||
| @@ -102,6 +100,9 @@ rm -rf %{buildroot}%{cargo_registry}/%{name}-%{version}/ | |||
| 102 | %{_libdir}/pkgconfig/nispor.pc | 100 | %{_libdir}/pkgconfig/nispor.pc |
| 103 | 101 | ||
| 104 | %changelog | 102 | %changelog |
| 103 | +* Thu Oct 30 2025 jiangxinyu <jiangxinyu@kylinos.cn> - 1.0.1-6 | ||
| 104 | +- Fix compilation failures caused by rust-packaging | ||
| 105 | + | ||
| 105 | * Thu Apr 17 2025 jiangxinyu <jiangxinyu@kylinos.cn> - 1.0.1-5 | 106 | * Thu Apr 17 2025 jiangxinyu <jiangxinyu@kylinos.cn> - 1.0.1-5 |
| 106 | - Limit rust-packaging version | 107 | - Limit rust-packaging version |
| 107 | 108 | ||