From a6008572b9e25e01edea1bb454a345eb2d211c6d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sep 29 2020 10:20:12 +0000 Subject: bump rust-ini to 0.15 --- diff --git a/0002-Bump-rust-ini-dependency.patch b/0002-Bump-rust-ini-dependency.patch new file mode 100644 index 0000000..5dc96cc --- /dev/null +++ b/0002-Bump-rust-ini-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/src/modules/os.rs b/src/modules/os.rs +index c50b72f..9632e95 100644 +--- a/src/modules/os.rs ++++ b/src/modules/os.rs +@@ -17,7 +17,7 @@ pub fn segment(segment: &mut Segment, _: &[&str]) { + #[cfg(target_os = "linux")] + pub fn segment(segment: &mut Segment, _: &[&str]) { + let release = Ini::load_from_file("/etc/os-release").unwrap(); +- segment.value = match release.general_section()["ID"].as_str() { ++ segment.value = match release.general_section()["ID"].as_ref() { + "arch" => icons::get("arch"), + "centos" => icons::get("centOS"), + "debian" => icons::get("debian"), diff --git a/rust-silver.spec b/rust-silver.spec index f542bdd..3493249 100644 --- a/rust-silver.spec +++ b/rust-silver.spec @@ -6,7 +6,7 @@ Name: rust-%{crate} Version: 1.1.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Cross-shell customizable powerline-like prompt with icons # Upstream license specification: Unlicense @@ -19,8 +19,10 @@ Source: %{crates_source} # * Bump to hostname 0.3, humantime 2, https://github.com/reujab/silver/pull/24 # * Drop yaml feature from clap, https://github.com/reujab/silver/pull/24 # * Update users to 0.10, https://github.com/reujab/silver/pull/32 +# * Update rust-ini to 0.15, https://github.com/reujab/silver/commit/276ad67 Patch0: silver-fix-metadata.diff Patch1: 0001-Bump-hostname-dependency.patch +Patch2: 0002-Bump-rust-ini-dependency.patch ExclusiveArch: %{rust_arches} @@ -65,6 +67,9 @@ License: Unlicense and MIT %endif %changelog +* Tue Sep 29 2020 Fabio Valentini - 1.1.0-10 +- Port to rust-ini 0.15. + * Sun Aug 16 15:01:43 GMT 2020 Igor Raits - 1.1.0-9 - Rebuild diff --git a/silver-fix-metadata.diff b/silver-fix-metadata.diff index f84076f..82176d1 100644 --- a/silver-fix-metadata.diff +++ b/silver-fix-metadata.diff @@ -1,5 +1,5 @@ --- silver-1.1.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ silver-1.1.0/Cargo.toml 2020-05-22T09:37:37.777829+00:00 ++++ silver-1.1.0/Cargo.toml 2020-09-29T10:09:14.230803+00:00 @@ -25,19 +25,18 @@ [dependencies.clap] @@ -23,7 +23,13 @@ [dependencies.lazy_static] version = "1" -@@ -54,7 +53,4 @@ +@@ -49,12 +48,9 @@ + version = "1" + + [dependencies.rust-ini] +-version = "0.13" ++version = "0.15" + [dependencies.url] version = "2" [target."cfg(not(windows))".dependencies.users]