Update to version 0.23.13

3 years ago · 28bdf21c18
parent cee5898b66
commit 28bdf21c18
4 changed files with 76 additions and 50 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,3 +25,4 @@
 /sysinfo-0.15.9.crate
 /sysinfo-0.18.2.crate
 /sysinfo-0.19.2.crate
+/sysinfo-0.23.13.crate
--- a/rust-sysinfo.spec
+++ b/rust-sysinfo.spec
@ -1,11 +1,11 @@
-# Generated by rust2rpm 18
+# Generated by rust2rpm 21
 %bcond_without check
 %global debug_package %{nil}

 %global crate sysinfo

 Name:           rust-%{crate}
-Version:        0.19.2
+Version:        0.23.13
 Release:        %autorelease
 Summary:        Library to get system information

@ -14,16 +14,13 @@ License:        MIT
 URL:            https://crates.io/crates/sysinfo
 Source:         %{crates_source}
 # Initial patched metadata
-# * No Windows deps
-# * No Mac OS deps
+# * drop Windows-specific dependencies
+# * drop AppleOS-specific dependencies and features
 Patch0:         sysinfo-fix-metadata.diff

 ExclusiveArch:  %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif

-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21

 %global _description %{expand:
 Library to get system information such as processes, processors, disks,
@ -37,13 +34,15 @@ BuildArch:      noarch

 %description    devel %{_description}

-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.

 %files          devel
-%license LICENSE
-%doc README.md CHANGELOG.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE
+%doc %{crate_instdir}/ADDING_NEW_PLATFORMS.md
+%doc %{crate_instdir}/CHANGELOG.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/

 %package     -n %{name}+default-devel
 Summary:        %{summary}
@ -51,23 +50,11 @@ BuildArch:      noarch

 %description -n %{name}+default-devel %{_description}

-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+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 %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package     -n %{name}+apple-app-store-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+apple-app-store-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "apple-app-store" feature of "%{crate}" crate.
-
-%files       -n %{name}+apple-app-store-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml

 %package     -n %{name}+c-interface-devel
 Summary:        %{summary}
@ -75,11 +62,11 @@ BuildArch:      noarch

 %description -n %{name}+c-interface-devel %{_description}

-This package contains library source intended for building other packages
-which use "c-interface" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "c-interface" feature of the "%{crate}" crate.

 %files       -n %{name}+c-interface-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml

 %package     -n %{name}+debug-devel
 Summary:        %{summary}
@ -87,11 +74,11 @@ BuildArch:      noarch

 %description -n %{name}+debug-devel %{_description}

-This package contains library source intended for building other packages
-which use "debug" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "debug" feature of the "%{crate}" crate.

 %files       -n %{name}+debug-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml

 %package     -n %{name}+multithread-devel
 Summary:        %{summary}
@ -99,11 +86,11 @@ BuildArch:      noarch

 %description -n %{name}+multithread-devel %{_description}

-This package contains library source intended for building other packages
-which use "multithread" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "multithread" feature of the "%{crate}" crate.

 %files       -n %{name}+multithread-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml

 %package     -n %{name}+rayon-devel
 Summary:        %{summary}
@ -111,11 +98,11 @@ BuildArch:      noarch

 %description -n %{name}+rayon-devel %{_description}

-This package contains library source intended for building other packages
-which use "rayon" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "rayon" feature of the "%{crate}" crate.

 %files       -n %{name}+rayon-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml

 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
@ -132,10 +119,8 @@ which use "rayon" feature of "%{crate}" crate.

 %if %{with check}
 %check
-# https://github.com/GuillaumeGomez/sysinfo/issues/517
-# https://github.com/GuillaumeGomez/sysinfo/issues/518
-# https://github.com/GuillaumeGomez/sysinfo/issues/519
-%cargo_test -- -- --skip test::check_uid_gid --skip test_disks --skip test_physical_core_numbers
+# * skip tests that fail when run on VMs, on tmpfs, or in systemd-nspawn
+%cargo_test -- -- --skip test::check_processes_cpu_usage --skip test::check_processors_number --skip test_disks
 %endif

 %changelog
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (sysinfo-0.19.2.crate) = aa27977890afb37b8d6e3467302b301ce7076c53224808a361f1c2780038d0779a719e9a90fede64379cf7f3d391dbe557a79e393ddcc2c35faee17fc50f14a0
+SHA512 (sysinfo-0.23.13.crate) = 9aab3bccb6dab2a2b82dc0abe23924d0993c67c06b8c2748fff61825f78c4e783f821d7f0a4b1bb8ac82f816e3542caf20f59868e5122b03086b958ed68e6cb6
--- a/sysinfo-fix-metadata.diff
+++ b/sysinfo-fix-metadata.diff
@ -1,16 +1,56 @@
--- sysinfo-0.19.2/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sysinfo-0.19.2/Cargo.toml	2021-08-01T21:10:35.883575+00:00
-@@ -46,13 +46,5 @@
+--- sysinfo-0.23.13/Cargo.toml	1970-01-01T00:00:01+00:00
+++ sysinfo-0.23.13/Cargo.toml	2022-07-21T09:06:18.427214+00:00
+@@ -45,53 +45,13 @@
+ optional = true
+ 
+ [features]
+-apple-app-store = ["apple-sandbox"]
+-apple-sandbox = []
+ c-interface = []
+ debug = ["libc/extra_traits"]
+ default = ["multithread"]
 multithread = ["rayon"]
+-unknown-ci = []
+ 
 [target."cfg(all(target_os = \"linux\", not(target_os = \"android\")))".dev-dependencies.tempfile]
 version = "3.2"
+ 
 -[target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies.core-foundation-sys]
 -version = "0.8"
+-
 [target."cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))".dependencies.libc]
- version = "^0.2.94"
+ version = "^0.2.112"
+-
 -[target."cfg(windows)".dependencies.ntapi]
 -version = "0.3"
 -
 -[target."cfg(windows)".dependencies.winapi]
 -version = "0.3.9"
-features = ["fileapi", "handleapi", "ifdef", "ioapiset", "minwindef", "pdh", "psapi", "synchapi", "sysinfoapi", "winbase", "winerror", "winioctl", "winnt", "oleauto", "wbemcli", "rpcdce", "combaseapi", "objidl", "powerbase", "netioapi", "lmcons", "lmaccess", "lmapibuf", "memoryapi", "shellapi"]
+-features = [
+-    "fileapi",
+-    "handleapi",
+-    "ifdef",
+-    "ioapiset",
+-    "minwindef",
+-    "pdh",
+-    "psapi",
+-    "synchapi",
+-    "sysinfoapi",
+-    "winbase",
+-    "winerror",
+-    "winioctl",
+-    "winnt",
+-    "oleauto",
+-    "wbemcli",
+-    "rpcdce",
+-    "combaseapi",
+-    "objidl",
+-    "powerbase",
+-    "netioapi",
+-    "lmcons",
+-    "lmaccess",
+-    "lmapibuf",
+-    "memoryapi",
+-    "shellapi",
+-    "std",
+-]