rd-agent-fix-metadata.diff

@@ -1,5 +1,5 @@
 --- rd-agent-2.2.5/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ rd-agent-2.2.5/Cargo.toml	2026-01-05T10:01:01.383431+00:00
++++ rd-agent-2.2.5/Cargo.toml	2024-04-25T18:33:02.024271+00:00
 @@ -30,7 +30,7 @@
  version = "0.8"
  
@@ -9,12 +9,3 @@
  
  [dependencies.glob]
  version = "0.3"
-@@ -61,7 +61,7 @@
- version = "0.3"
- 
- [dependencies.procfs]
--version = "0.16"
-+version = ">=0.16, <0.19"
- 
- [dependencies.rd-agent-intf]
- version = "2.2.5"

rust-rd-agent.spec

@@ -1,10 +1,10 @@
-# Generated by rust2rpm 28
-%bcond check 1
+# Generated by rust2rpm 26
+%bcond_without check
 
 %global crate rd-agent
 
 %global selinuxtype targeted
-%bcond selinux 1
+%bcond_without selinux
 
 Name:           rust-rd-agent
 Version:        2.2.5
@@ -18,9 +18,6 @@ Source:         %{crates_source}
 Source:         https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.11.tar.xz
 # Manually created patch for downstream crate metadata changes
 # * bump enum-iterator to 2.0
-# * allow procfs 0.17,
-#   https://github.com/facebookexperimental/resctl-demo/pull/326, and 0.18,
-#   https://github.com/facebookexperimental/resctl-demo/pull/335
 Patch:          rd-agent-fix-metadata.diff
 # https://github.com/facebookexperimental/resctl-demo/commit/f65eedf9017332255ef0a48649664c26b45b9c07
 Patch:          rd-agent-enum-iterator.patch
@@ -43,21 +40,19 @@ Management agent for resctl-demo.}
 %package     -n %{crate}
 Summary:        %{summary}
 # (MIT OR Apache-2.0) AND Unicode-DFS-2016
-# 0BSD
 # 0BSD OR MIT OR Apache-2.0
 # Apache-2.0
 # Apache-2.0 OR BSL-1.0
 # Apache-2.0 OR MIT
 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-# BSD-2-Clause OR Apache-2.0 OR MIT
 # MIT
 # MIT OR Apache-2.0
 # MIT OR Zlib OR Apache-2.0
 # Unlicense OR MIT
-License:        0BSD AND Apache-2.0 AND MIT AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT)
+License:        ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT)
 # LICENSE.dependencies contains a full license breakdown
 
-%if %{with selinux}
+%if 0%{?with_selinux}
 Requires:       (%{crate}-selinux if selinux-policy-%{selinuxtype})
 %endif
 Recommends:     rd-hashd = %{version}
@@ -89,7 +84,7 @@ This package contains data files for %{crate}.
 %files       -n %{crate}-data
 %{_datadir}/resctl-demo
 
-%if %{with selinux}
+%if 0%{?with_selinux}
 %package     -n %{crate}-selinux
 Summary:        SELinux policy for %{crate}
 BuildArch:      noarch
@@ -121,7 +116,7 @@ fi
 %prep
 %autosetup -n %{crate}-%{version} -p1
 %cargo_prep
-%if %{with selinux}
+%if 0%{?with_selinux}
 mkdir selinux
 cp -p %{SOURCE10} %{SOURCE11} %{SOURCE12} selinux
 %endif
@@ -133,7 +128,7 @@ cp -p %{SOURCE10} %{SOURCE11} %{SOURCE12} selinux
 %cargo_build
 %{cargo_license_summary}
 %{cargo_license} > LICENSE.dependencies
-%if %{with selinux}
+%if 0%{?with_selinux}
 make -C selinux -f %{_datadir}/selinux/devel/Makefile %{crate}.pp
 bzip2 -9 selinux/%{crate}.pp
 %endif
@@ -143,7 +138,7 @@ bzip2 -9 selinux/%{crate}.pp
 install -Dpm0644 %SOURCE1 %{buildroot}%{_datadir}/resctl-demo/linux.tar.xz
 mkdir -p %{buildroot}%{_sharedstatedir}/resctl-demo
 
-%if %{with selinux}
+%if 0%{?with_selinux}
 install -Dm0644 selinux/%{crate}.pp.bz2 \
     %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{crate}.pp.bz2
 %endif