diff --git a/0001-Bump-hostname-dependency.patch b/0001-Bump-hostname-dependency.patch new file mode 100644 index 0000000..0f45fb8 --- /dev/null +++ b/0001-Bump-hostname-dependency.patch @@ -0,0 +1,24 @@ +From 87635a90c0025f6f7931a56630878717d82b3b8f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Fri, 14 Feb 2020 11:09:30 +0100 +Subject: [PATCH] Bump hostname dependency + +--- + src/modules/user.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/user.rs b/src/modules/user.rs +index e6f440a96d00..5d821d763073 100644 +--- a/src/modules/user.rs ++++ b/src/modules/user.rs +@@ -20,6 +20,6 @@ pub fn segment(segment: &mut Segment, _: &[&str]) { + .unwrap() + .into_string() + .unwrap(), +- hostname::get_hostname().unwrap() ++ hostname::get().unwrap().to_string_lossy() + ) + } +-- +2.24.1 + diff --git a/rust-silver.spec b/rust-silver.spec index b641a7b..0fdced4 100644 --- a/rust-silver.spec +++ b/rust-silver.spec @@ -6,7 +6,7 @@ Name: rust-%{crate} Version: 1.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Cross-shell customizable powerline-like prompt with icons # Upstream license specification: Unlicense @@ -15,8 +15,10 @@ URL: https://crates.io/crates/silver Source: %{crates_source} # Initial patched metadata # * No Windows -# * Bump git2 to 0.11 https://github.com/reujab/silver/pull/22 +# * Bump git2 to 0.12 https://github.com/reujab/silver/pull/22 +# * Bump to hostname 0.3, humantime 2, https://github.com/reujab/silver/pull/24 Patch0: silver-fix-metadata.diff +Patch1: 0001-Bump-hostname-dependency.patch ExclusiveArch: %{rust_arches} @@ -49,7 +51,6 @@ Summary: %{summary} %install %cargo_install -rm -f %{buildroot}%{_prefix}/.crates2.json %if %{with check} %check @@ -57,6 +58,11 @@ rm -f %{buildroot}%{_prefix}/.crates2.json %endif %changelog +* Tue Mar 03 2020 Josh Stone - 1.1.0-4 +- Bump to git2 0.12 +- Bump to hostname 0.3 +- Bump to humantime 2 + * Sun Feb 02 20:23:45 CET 2020 Robert-André Mauchin - 1.1.0-3 - Bump git2 to 0.11 diff --git a/silver-fix-metadata.diff b/silver-fix-metadata.diff index 6149de8..4476c40 100644 --- a/silver-fix-metadata.diff +++ b/silver-fix-metadata.diff @@ -1,14 +1,22 @@ ---- silver-1.1.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ silver-1.1.0/Cargo.toml 2020-02-02T19:21:05.160448+00:00 -@@ -31,7 +31,7 @@ +--- silver-1.1.0/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ silver-1.1.0/Cargo.toml 2020-03-03T22:35:38.555397+00:00 +@@ -31,13 +31,13 @@ version = "2" [dependencies.git2] -version = "0.9" -+version = "0.11" ++version = "0.12" [dependencies.hostname] - version = "0.1" +-version = "0.1" ++version = "0.3" + + [dependencies.humantime] +-version = "1" ++version = "2" + + [dependencies.lazy_static] + version = "1" @@ -55,6 +55,3 @@ version = "2" [target."cfg(not(windows))".dependencies.users]