fix: bottom (#6082) (#6272)

This commit is contained in:
Raboneko
2025-09-02 03:12:32 -07:00
committed by GitHub
parent 6286cba4ff
commit 42c0378e4f
2 changed files with 239 additions and 33 deletions
@@ -1,33 +1,33 @@
--- bottom-0.10.2/Cargo.toml 1970-01-01T00:00:01+00:00
+++ bottom-0.10.2/Cargo.toml 2024-08-18T14:28:49.594610+00:00
@@ -354,15 +354,6 @@
--- bottom-0.11.1/Cargo.toml 1970-01-01T00:00:01+00:00
+++ bottom-0.11.1/Cargo.toml 2025-08-15T10:26:42.425577+00:00
@@ -357,38 +357,11 @@
[target.'cfg(all(target_arch = "x86_64", target_os = "linux"))'.dev-dependencies.portable-pty]
version = "0.8.1"
version = "0.9.0"
-[target.'cfg(target_os = "freebsd")'.dependencies.filedescriptor]
-version = "0.8.2"
-version = "0.8.3"
-
-[target.'cfg(target_os = "freebsd")'.dependencies.serde_json]
-version = "1.0.120"
-version = "1.0.142"
-
-[target.'cfg(target_os = "freebsd")'.dependencies.sysctl]
-version = "0.5.5"
-version = "0.6.0"
-
[target.'cfg(target_os = "linux")'.dependencies.rustix]
version = "0.38.34"
version = "1.0.8"
features = [
@@ -370,24 +361,6 @@
"fs",
"param",
]
-]
-
-[target.'cfg(target_os = "macos")'.dependencies.core-foundation]
-version = "0.9.4"
-version = "0.10.1"
-
-[target.'cfg(target_os = "macos")'.dependencies.mach2]
-version = "0.4.2"
-version = "0.4.3"
-
-[target.'cfg(target_os = "windows")'.dependencies.windows]
-version = "0.58.0"
-version = "0.61.3"
-features = [
- "Win32_Foundation",
- "Win32_Security",
@@ -36,13 +36,11 @@
- "Win32_System_Ioctl",
- "Win32_System_ProcessStatus",
- "Win32_System_Threading",
-]
-
[target."cfg(unix)".dependencies.libc]
version = "0.2.155"
]
@@ -402,3 +375,4 @@
[lints.rustdoc]
broken_intra_doc_links = "deny"
missing_crate_level_docs = "deny"
[target."cfg(unix)".dependencies.libc]
@@ -420,3 +393,4 @@
codegen-units = 1
debug = 0
strip = "symbols"
+
+219 -11
View File
@@ -1,6 +1,7 @@
# Generated by rust2rpm 26
%bcond_without check
# Generated by rust2rpm 27
%bcond check 0
%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
%global crate bottom
Name: rust-bottom
@@ -25,7 +26,7 @@ terminal. Supports Linux, macOS, and Windows.}
%package -n %{crate}
Summary: %{summary}
License: MIT
License: (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 MIT OR Apache-2.0) AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT)
Packager: Ben Woods <git@ben.woods.am>
%description -n %{crate} %{_description}
@@ -35,25 +36,232 @@ Packager: Ben Woods <git@ben.woods.am>
%license LICENSE.dependencies
%doc README.md
%{_bindir}/btm
%{_datadir}/bash-completion/completions/btm
%{_datadir}/fish/vendor_completions.d/btm.fish
%{_datadir}/zsh/site-functions/_btm
%{_bindir}/schema
%{_mandir}/man1/btm.1*
%pkg_completion -Bfz -n %crate btm
%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
%package -n %{name}+battery-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+battery-devel %{_description}
This package contains library source intended for building other packages which
use the "battery" feature of the "%{crate}" crate.
%files -n %{name}+battery-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+deploy-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+deploy-devel %{_description}
This package contains library source intended for building other packages which
use the "deploy" feature of the "%{crate}" crate.
%files -n %{name}+deploy-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+fern-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+fern-devel %{_description}
This package contains library source intended for building other packages which
use the "fern" feature of the "%{crate}" crate.
%files -n %{name}+fern-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+generate_schema-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+generate_schema-devel %{_description}
This package contains library source intended for building other packages which
use the "generate_schema" feature of the "%{crate}" crate.
%files -n %{name}+generate_schema-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+gpu-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+gpu-devel %{_description}
This package contains library source intended for building other packages which
use the "gpu" feature of the "%{crate}" crate.
%files -n %{name}+gpu-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+log-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+log-devel %{_description}
This package contains library source intended for building other packages which
use the "log" feature of the "%{crate}" crate.
%files -n %{name}+log-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+logging-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+logging-devel %{_description}
This package contains library source intended for building other packages which
use the "logging" feature of the "%{crate}" crate.
%files -n %{name}+logging-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+nvidia-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+nvidia-devel %{_description}
This package contains library source intended for building other packages which
use the "nvidia" feature of the "%{crate}" crate.
%files -n %{name}+nvidia-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+nvml-wrapper-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+nvml-wrapper-devel %{_description}
This package contains library source intended for building other packages which
use the "nvml-wrapper" feature of the "%{crate}" crate.
%files -n %{name}+nvml-wrapper-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+schemars-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+schemars-devel %{_description}
This package contains library source intended for building other packages which
use the "schemars" feature of the "%{crate}" crate.
%files -n %{name}+schemars-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serde_json-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+serde_json-devel %{_description}
This package contains library source intended for building other packages which
use the "serde_json" feature of the "%{crate}" crate.
%files -n %{name}+serde_json-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+starship-battery-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+starship-battery-devel %{_description}
This package contains library source intended for building other packages which
use the "starship-battery" feature of the "%{crate}" crate.
%files -n %{name}+starship-battery-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+strum-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+strum-devel %{_description}
This package contains library source intended for building other packages which
use the "strum" feature of the "%{crate}" crate.
%files -n %{name}+strum-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+time-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+time-devel %{_description}
This package contains library source intended for building other packages which
use the "time" feature of the "%{crate}" crate.
%files -n %{name}+time-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+zfs-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+zfs-devel %{_description}
This package contains library source intended for building other packages which
use the "zfs" feature of the "%{crate}" crate.
%files -n %{name}+zfs-devel
%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version} -p1
%cargo_prep_online
%build
#cargo_build
%{cargo_license_summary_online}
%{cargo_license_online} > LICENSE.dependencies
#cargo_build -f generate_schema
%{cargo_license_summary_online -f generate_schema}
%{cargo_license_online -f generate_schema} > LICENSE.dependencies
%install
# https://github.com/ClementTsang/bottom/blob/main/docs/content/contribution/packaging-and-distribution.md#manpage-and-completion-generation
export BTM_GENERATE=true
%cargo_install
%cargo_install -f generate_schema
# Completions
ls target/tmp/bottom
install -Dpm 0644 target/tmp/bottom/completion/btm.bash %{buildroot}%{_datadir}/bash-completion/completions/btm
install -Dpm 0644 target/tmp/bottom/completion/btm.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/btm.fish
install -Dpm 0644 target/tmp/bottom/completion/_btm %{buildroot}%{_datadir}/zsh/site-functions/_btm
@@ -61,7 +269,7 @@ install -Dpm 0644 target/tmp/bottom/manpage/btm.1 %{buildroot}%{_mandir}/man1/bt
%if %{with check}
%check
%cargo_test
%cargo_test -f generate_schema
%endif
%changelog