From eb8dfb49ccc454595acaba9e6fb2017a7773137d Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 16 Mar 2023 22:42:23 +0100
Subject: [PATCH] Update to version 0.28.2; Fixes RHBZ#2173415

---
 .gitignore                     |  1 +
 README.md                      |  3 ---
 rust-sysinfo.spec              | 21 +++------------------
 sources                        |  2 +-
 sysinfo-fix-metadata-auto.diff |  4 ++--
 sysinfo-fix-metadata.diff      |  4 ++--
 6 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 README.md

diff --git a/.gitignore b/.gitignore
index ec7a589..dd133d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /sysinfo-0.24.7.crate
 /sysinfo-0.27.7.crate
 /sysinfo-0.28.0.crate
+/sysinfo-0.28.2.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 77fefa9..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-sysinfo
-
-The rust-sysinfo package
\ No newline at end of file
diff --git a/rust-sysinfo.spec b/rust-sysinfo.spec
index 3a05bca..81755c7 100644
--- a/rust-sysinfo.spec
+++ b/rust-sysinfo.spec
@@ -5,7 +5,7 @@
 %global crate sysinfo
 
 Name:           rust-sysinfo
-Version:        0.28.0
+Version:        0.28.2
 Release:        %autorelease
 Summary:        Library to get system information such as processes, CPUs, disks, components and networks
 
@@ -129,23 +129,8 @@ use the "serde" feature of the "%{crate}" crate.
 
 %if %{with check}
 %check
-# skip tests that fail when run on vms, on tmpfs, or in systemd-nspawn
-%if 0%{?fedora} >= 38
-SKIP_TESTS=""
-%else
-SKIP_TESTS=" --skip test::check_all_process_uids_resolvable --skip test_disks"
-%endif
-
-%ifarch s390x
-# these tests panic with assertion failures on s390x
-SKIP_TESTS+=" --skip test::check_cpus_number --skip test::check_processes_cpu_usage"
-%endif
-
-if [ -e ${SKIP_TESTS} ]; then
-%cargo_test
-else
-%cargo_test -- -- ${SKIP_TESTS}
-fi
+# * skip tests that fail in VMs or in systemd-nspawn containers on different architectures
+%cargo_test -- -- --skip test::check_all_process_uids_resolvable --skip test::check_cpu_usage --skip test::check_cpus_number --skip test::check_processes_cpu_usage --skip test_disks
 %endif
 
 %changelog
diff --git a/sources b/sources
index cd8fb95..6fb138c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sysinfo-0.28.0.crate) = 85687f7809d52209e38aa53432125b29dd193c13a48439204ff747564dce12bab1675c5f148b5001b0a5d9f30e91ec93265dd905248bd361e4340228a3fc6de5
+SHA512 (sysinfo-0.28.2.crate) = d94194995ed363bf2444c0f68865b5862e3132f0d4093be1b431f37411cfa1402504bdbc7a14150b49055fa15cf75fd4680d1b6535cfd41ca587a8d6492df90a
diff --git a/sysinfo-fix-metadata-auto.diff b/sysinfo-fix-metadata-auto.diff
index c2ce9e1..c72abf3 100644
--- a/sysinfo-fix-metadata-auto.diff
+++ b/sysinfo-fix-metadata-auto.diff
@@ -1,5 +1,5 @@
---- sysinfo-0.28.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sysinfo-0.28.0/Cargo.toml	2023-02-22T18:42:41.367029+00:00
+--- sysinfo-0.28.2/Cargo.toml	1970-01-01T00:00:01+00:00
++++ sysinfo-0.28.2/Cargo.toml	2023-03-16T20:26:51.008672+00:00
 @@ -58,52 +58,9 @@
  [target."cfg(all(target_os = \"linux\", not(target_os = \"android\")))".dev-dependencies.tempfile]
  version = "3.2"
diff --git a/sysinfo-fix-metadata.diff b/sysinfo-fix-metadata.diff
index 5868494..de3eb50 100644
--- a/sysinfo-fix-metadata.diff
+++ b/sysinfo-fix-metadata.diff
@@ -1,5 +1,5 @@
---- sysinfo-0.28.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sysinfo-0.28.0/Cargo.toml	2023-02-22T18:43:20.922551+00:00
+--- sysinfo-0.28.2/Cargo.toml	1970-01-01T00:00:01+00:00
++++ sysinfo-0.28.2/Cargo.toml	2023-03-16T20:27:08.509739+00:00
 @@ -47,13 +47,10 @@
  version = "1.0"