commit
1736d4d66e
GPG Key ID:
1EC08A25C9DB2503
@ -0,0 +1,25 @@
|
||||
From f7f8d914d12ded4528fe4367854fbd939742f3a1 Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Valentini <decathorpe@gmail.com>
|
||||
Date: Mon, 9 Oct 2023 00:48:38 +0200
|
||||
Subject: [PATCH] Disambiguate num::Integer::div_ceil from <number>::div_ceil
|
||||
|
||||
---
|
||||
src/anon_area.rs | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/anon_area.rs b/src/anon_area.rs
|
||||
index cb37b78..d9d9b6d 100644
|
||||
--- a/src/anon_area.rs
|
||||
+++ b/src/anon_area.rs
|
||||
@@ -61,7 +61,7 @@ impl AnonArea {
|
||||
|
||||
pub fn resize(&mut self, mut size: usize) {
|
||||
size = size.max(Self::UNIT_SIZE);
|
||||
- let nr = size.div_ceil(&Self::UNIT_SIZE);
|
||||
+ let nr = Integer::div_ceil(&size, &Self::UNIT_SIZE);
|
||||
|
||||
self.units.truncate(nr);
|
||||
self.units.reserve(nr);
|
||||
--
|
||||
2.41.0
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,20 @@
|
||||
--- rd-util-2.1.2/Cargo.toml 1970-01-01T00:00:01+00:00
|
||||
+++ rd-util-2.1.2/Cargo.toml 2023-11-25T09:17:43.885314+00:00
|
||||
@@ -64,7 +64,7 @@
|
||||
version = "^1.13"
|
||||
|
||||
[dependencies.page_size]
|
||||
-version = "^0.4"
|
||||
+version = "^0.6"
|
||||
|
||||
[dependencies.proc-mounts]
|
||||
version = "^0.2"
|
||||
@@ -87,7 +87,7 @@
|
||||
version = "^1.0"
|
||||
|
||||
[dependencies.simplelog]
|
||||
-version = "^0.10"
|
||||
+version = "^0.11"
|
||||
|
||||
[dependencies.sysinfo]
|
||||
version = "^0.19"
|
||||
@ -0,0 +1,116 @@
|
||||
## START: Set by rpmautospec
|
||||
## (rpmautospec version 0.3.5)
|
||||
## RPMAUTOSPEC: autorelease, autochangelog
|
||||
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
|
||||
release_number = 9;
|
||||
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
|
||||
print(release_number + base_release_number - 1);
|
||||
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
|
||||
## END: Set by rpmautospec
|
||||
|
||||
# Generated by rust2rpm 25
|
||||
%bcond_without check
|
||||
%global debug_package %{nil}
|
||||
|
||||
%global crate rd-util
|
||||
|
||||
Name: rust-rd-util
|
||||
Version: 2.1.2
|
||||
Release: %autorelease
|
||||
Summary: Utility collection library for resctl-demo
|
||||
|
||||
License: Apache-2.0
|
||||
URL: https://crates.io/crates/rd-util
|
||||
Source: %{crates_source}
|
||||
# Manually created patch for downstream crate metadata changes
|
||||
# * bump page_size dependency from 0.4 to 0.6
|
||||
# * bump simplelog dependency from 0.10 to 0.11:
|
||||
# https://github.com/facebookexperimental/resctl-demo/pull/262
|
||||
Patch: rd-util-fix-metadata.diff
|
||||
# * fix builds with Rust 1.73+ caused by ambiguous <number>::div_ceil calls
|
||||
Patch: 0001-Disambiguate-num-Integer-div_ceil-from-number-div_ce.patch
|
||||
|
||||
BuildRequires: cargo-rpm-macros >= 24
|
||||
|
||||
%global _description %{expand:
|
||||
Utility collection library for resctl-demo.}
|
||||
|
||||
%description %{_description}
|
||||
|
||||
%package devel
|
||||
Summary: %{summary}
|
||||
BuildArch: noarch
|
||||
|
||||
%description devel %{_description}
|
||||
|
||||
This package contains library source intended for building other packages which
|
||||
use the "%{crate}" crate.
|
||||
|
||||
%files devel
|
||||
%license %{crate_instdir}/LICENSE
|
||||
%doc %{crate_instdir}/README.md
|
||||
%{crate_instdir}/
|
||||
|
||||
%package -n %{name}+default-devel
|
||||
Summary: %{summary}
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n %{name}+default-devel %{_description}
|
||||
|
||||
This package contains library source intended for building other packages which
|
||||
use the "default" feature of the "%{crate}" crate.
|
||||
|
||||
%files -n %{name}+default-devel
|
||||
%ghost %{crate_instdir}/Cargo.toml
|
||||
|
||||
%prep
|
||||
%autosetup -n %{crate}-%{version} -p1
|
||||
%cargo_prep
|
||||
|
||||
%generate_buildrequires
|
||||
%cargo_generate_buildrequires
|
||||
|
||||
%build
|
||||
%cargo_build
|
||||
|
||||
%install
|
||||
%cargo_install
|
||||
|
||||
%if %{with check}
|
||||
%check
|
||||
%cargo_test
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jan 15 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.1.2-9
|
||||
- Rebuilt for MSVSphere 9.3
|
||||
|
||||
* Sat Nov 25 2023 Fabio Valentini <decathorpe@gmail.com> - 2.1.2-9
|
||||
- Bump page_size dependency from 0.4 to 0.6
|
||||
|
||||
* Sun Oct 08 2023 Fabio Valentini <decathorpe@gmail.com> - 2.1.2-8
|
||||
- Fix builds with Rust 1.73+ caused by ambiguous <number>::div_ceil calls
|
||||
|
||||
* Mon Aug 07 2023 Fabio Valentini <decathorpe@gmail.com> - 2.1.2-7
|
||||
- Regenerate with rust2rpm v24
|
||||
|
||||
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sun Feb 20 2022 Igor Raits <igor.raits@gmail.com> - 2.1.2-3
|
||||
- Update simplelog to 0.11
|
||||
|
||||
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Sep 21 2021 Davide Cavalca <dcavalca@fedoraproject.org> - 2.1.2-1
|
||||
- Update to 2.1.2; Fixes: RHBZ#2003260
|
||||
|
||||
* Thu Aug 26 2021 Davide Cavalca <dcavalca@fedoraproject.org> - 2.1.1-1
|
||||
- Initial import; Fixes: RHBZ#1990906
|
||||
Loading…
Reference in new issue