From 20b10428836de000e4c5e6d1fc32b0f4d02da16f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 1 Jan 2018 14:39:28 +0100 Subject: [PATCH] Update to 0.5.4 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + 0001-port-to-cc-crate.patch | 42 -------------------------------- rust-sys-info.spec | 10 +++----- sources | 2 +- sys-info-0.5.3-fix-metadata.diff | 10 -------- 5 files changed, 6 insertions(+), 59 deletions(-) delete mode 100644 0001-port-to-cc-crate.patch delete mode 100644 sys-info-0.5.3-fix-metadata.diff diff --git a/.gitignore b/.gitignore index ec81800..15f4b85 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /sys-info-0.5.3.crate +/sys-info-0.5.4.crate diff --git a/0001-port-to-cc-crate.patch b/0001-port-to-cc-crate.patch deleted file mode 100644 index cfe19aa..0000000 --- a/0001-port-to-cc-crate.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b224a310f0260aff647347758b7d913cc20c3507 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Mon, 4 Dec 2017 00:32:37 +0100 -Subject: [PATCH] port to cc crate - -Signed-off-by: Igor Gnatenko ---- - build.rs | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/build.rs b/build.rs -index c09ab88..04f2871 100644 ---- a/build.rs -+++ b/build.rs -@@ -1,4 +1,4 @@ --extern crate gcc; -+extern crate cc; - - use std::env; - -@@ -6,13 +6,15 @@ fn main() { - let target = env::var("TARGET").unwrap(); - let target_os = target.split('-').nth(2).unwrap(); - -+ let mut builder = cc::Build::new(); - match target_os { -- "linux" => gcc::compile_library("libinfo.a", &["c/linux.c"]), -- "darwin" => gcc::compile_library("libinfo.a", &["c/macos.c"]), -+ "linux" => builder.file("c/linux.c"), -+ "darwin" => builder.file("c/macos.c"), - "windows" => { -- gcc::compile_library("libinfo.a", &["c/windows.c"]); - println!("cargo:rustc-flags=-l psapi"); -+ builder.file("c/windows.c") - }, - _ => panic!("Unsupported system") - }; -+ builder.compile("info"); - } --- -2.15.1 - diff --git a/rust-sys-info.spec b/rust-sys-info.spec index 64275b1..416fbc9 100644 --- a/rust-sys-info.spec +++ b/rust-sys-info.spec @@ -5,18 +5,13 @@ %global crate sys-info Name: rust-%{crate} -Version: 0.5.3 +Version: 0.5.4 Release: 1%{?dist} Summary: Get system information in Rust License: MIT URL: https://crates.io/crates/sys-info Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate -# Initial patched metadata -# * Replace gcc with cc, https://github.com/FillZpp/sys-info-rs/pull/21 -Patch0: sys-info-0.5.3-fix-metadata.diff -# Finish gcc->cc -Patch1: 0001-port-to-cc-crate.patch ExclusiveArch: %{rust_arches} @@ -62,5 +57,8 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/ %changelog +* Mon Jan 01 2018 Igor Gnatenko - 0.5.4-1 +- Update to 0.5.4 + * Mon Dec 04 2017 Igor Gnatenko - 0.5.3-1 - Initial package diff --git a/sources b/sources index 8496cf7..6827984 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sys-info-0.5.3.crate) = 0eddce4753453753929129657c90dc2c37e0d2d80ec45707950adb4f9ec29deef950caabe118561309060c9d8a93fcfd67253763fad1a50391ada4781d3801ba +SHA512 (sys-info-0.5.4.crate) = f76cff57e5bd3bb1a7b2dce4765ff023117ffb2e0dfa7ceca921ee502496b832745873d60b65d9fd23ce1913e3da7342a733951a11d55e4ff00a646258fc60e5 diff --git a/sys-info-0.5.3-fix-metadata.diff b/sys-info-0.5.3-fix-metadata.diff deleted file mode 100644 index 361de31..0000000 --- a/sys-info-0.5.3-fix-metadata.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- sys-info-0.5.3/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ sys-info-0.5.3/Cargo.toml 2017-12-04T01:13:02.629820+01:00 -@@ -28,5 +28,5 @@ - path = "lib.rs" - [dependencies.libc] - version = "0.2.29" --[build-dependencies.gcc] --version = "0.3.51" -+[build-dependencies.cc] -+version = "1"