[rpms/rust-rustyline] epel9: update to version 6.2.0

[rpms/rust-rustyline] epel9: update to version 6.2.0

[Fabio Valentini]

A new commit has been pushed.

Repo   : rpms/rust-rustyline
Branch : epel9
Commit : 7d48102b5cc927c8ccdcd9321134cf584f4592f3
Author : Fabio Valentini <decathorpe@gmail.com>
Date   : 2020-09-09T11:10:04+02:00
Stats  : +138/-30 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-rustyline/c/7d48102b5cc927c8ccdcd9321134cf584f4592f3?branch=epel9

Log:
update to version 6.2.0

---
diff --git a/.gitignore b/.gitignore
index 954e779..199025d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /rustyline-6.1.0.crate
 /rustyline-6.1.1.crate
 /rustyline-6.1.2.crate
+/rustyline-6.2.0.crate

diff --git a/00-fixup-cargo-toml.patch b/00-fixup-cargo-toml.patch
deleted file mode 100644
index 08101f6..0000000
--- a/00-fixup-cargo-toml.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 21d7fbf..ff121dd 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -71,17 +71,12 @@ with-fuzzy = ["skim"]
- version = "0.17"
- 
- [target."cfg(unix)".dependencies.skim]
--version = "0.7"
-+version = "0.8"
- optional = true
- 
- [target."cfg(unix)".dependencies.utf8parse]
- version = "0.2"
--[target."cfg(windows)".dependencies.scopeguard]
--version = "1.1"
- 
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["consoleapi", "handleapi", "minwindef", "processenv", "winbase", "wincon", "winuser"]
- [badges.github-actions]
- repository = "kkawakam/rustyline"
- workflow = "Rust"

diff --git a/0001-revert-dirs-next-move.patch b/0001-revert-dirs-next-move.patch
new file mode 100644
index 0000000..4cf77f6
--- /dev/null
+++ b/0001-revert-dirs-next-move.patch
@@ -0,0 +1,73 @@
+From 43b18c2df43f53e073052b5e379b317cd686d78a Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Wed, 9 Sep 2020 11:01:12 +0200
+Subject: [PATCH 1/2] revert dirs-next move
+
+---
+ Cargo.toml        | 6 +++---
+ Cargo.toml.orig   | 4 ++--
+ src/completion.rs | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index d594ede..e130e81 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -30,8 +30,8 @@ no-default-features = true
+ [dependencies.cfg-if]
+ version = "0.1.6"
+ 
+-[dependencies.dirs-next]
+-version = "1.0"
++[dependencies.dirs]
++version = "2.0"
+ optional = true
+ 
+ [dependencies.libc]
+@@ -65,7 +65,7 @@ version = "0.3"
+ 
+ [features]
+ default = ["with-dirs"]
+-with-dirs = ["dirs-next"]
++with-dirs = ["dirs"]
+ with-fuzzy = ["skim"]
+ [target."cfg(unix)".dependencies.nix]
+ version = "0.17"
+diff --git a/Cargo.toml.orig b/Cargo.toml.orig
+index 309f432..95145c1 100644
+--- a/Cargo.toml.orig
++++ b/Cargo.toml.orig
+@@ -20,7 +20,7 @@ members = ["rustyline-derive"]
+ 
+ [dependencies]
+ cfg-if = "0.1.6"
+-dirs-next = { version = "1.0", optional = true }
++dirs = { version = "2.0", optional = true }
+ libc = "0.2"
+ log = "0.4"
+ unicode-width = "0.1"
+@@ -45,7 +45,7 @@ rustyline-derive = { version = "0.3.1", path = "rustyline-derive" }
+ 
+ [features]
+ default = ["with-dirs"]
+-with-dirs = ["dirs-next"]
++with-dirs = ["dirs"]
+ with-fuzzy = ["skim"]
+ 
+ [package.metadata.docs.rs]
+diff --git a/src/completion.rs b/src/completion.rs
+index 79ac346..c8d71c3 100644
+--- a/src/completion.rs
++++ b/src/completion.rs
+@@ -298,7 +298,7 @@ fn filename_complete(
+     quote: Quote,
+ ) -> Result<Vec<Pair>> {
+     #[cfg(feature = "with-dirs")]
+-    use dirs_next::home_dir;
++    use dirs::home_dir;
+     use std::env::current_dir;
+ 
+     let sep = path::MAIN_SEPARATOR;
+-- 
+2.26.2
+

diff --git a/0002-fixup-cargo-dependencies.patch b/0002-fixup-cargo-dependencies.patch
new file mode 100644
index 0000000..8cdd2e6
--- /dev/null
+++ b/0002-fixup-cargo-dependencies.patch
@@ -0,0 +1,53 @@
+From 01751d8415e2ee49be68b86de8e0d66f34091759 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Wed, 9 Sep 2020 11:03:04 +0200
+Subject: [PATCH 2/2] fixup cargo dependencies
+
+---
+ Cargo.toml      | 7 +------
+ Cargo.toml.orig | 6 +-----
+ 2 files changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index e130e81..334923d 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -71,17 +71,12 @@ with-fuzzy = ["skim"]
+ version = "0.17"
+ 
+ [target."cfg(unix)".dependencies.skim]
+-version = "0.7"
++version = "0.8"
+ optional = true
+ 
+ [target."cfg(unix)".dependencies.utf8parse]
+ version = "0.2"
+-[target."cfg(windows)".dependencies.scopeguard]
+-version = "1.1"
+ 
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3"
+-features = ["consoleapi", "handleapi", "minwindef", "processenv", "winbase", "wincon", "winuser"]
+ [badges.github-actions]
+ repository = "kkawakam/rustyline"
+ workflow = "Rust"
+diff --git a/Cargo.toml.orig b/Cargo.toml.orig
+index 95145c1..a0d14b7 100644
+--- a/Cargo.toml.orig
++++ b/Cargo.toml.orig
+@@ -30,11 +30,7 @@ memchr = "2.0"
+ [target.'cfg(unix)'.dependencies]
+ nix = "0.17"
+ utf8parse = "0.2"
+-skim = { version = "0.7", optional = true }
+-
+-[target.'cfg(windows)'.dependencies]
+-winapi = { version = "0.3", features = ["consoleapi", "handleapi", "minwindef", "processenv", "winbase", "wincon", "winuser"] }
+-scopeguard = "1.1"
++skim = { version = "0.8", optional = true }
+ 
+ [dev-dependencies]
+ doc-comment = "0.3"
+-- 
+2.26.2
+

diff --git a/rust-rustyline.spec b/rust-rustyline.spec
index 2593529..20de3df 100644
--- a/rust-rustyline.spec
+++ b/rust-rustyline.spec
@@ -5,8 +5,8 @@
 %global crate rustyline
 
 Name:           rust-%{crate}
-Version:        6.1.2
-Release:        2%{?dist}
+Version:        6.2.0
+Release:        1%{?dist}
 Summary:        Readline implementation based on Antirez's Linenoise
 
 # Upstream license specification: MIT
@@ -14,10 +14,11 @@ License:        MIT
 URL:            https://crates.io/crates/rustyline
 Source:         %{crates_source}
 
-# fixup Cargo.toml metadata:
-# - drop windows-specific dependencies
-# - adapt to versions of dependencies available on fedora
-Patch0:         00-fixup-cargo-toml.patch
+# revert unnecessary move to not-yet-packaged dirs-next
+Patch1:         0001-revert-dirs-next-move.patch
+
+# fix cargo dependencies (drop windows deps, bump skim 0.7 → 0.8)
+Patch2:         0002-fixup-cargo-dependencies.patch
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -124,6 +125,9 @@ which use "with-fuzzy" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Wed Sep 09 2020 Fabio Valentini <decathorpe@gmail.com> - 6.2.0-1
+- Update to version 6.2.0.
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

diff --git a/sources b/sources
index af2cea0..86a97ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rustyline-6.1.2.crate) = e66d76c3d19e37ed8c5635a9f27c3cea6b1f4fc9201369220adf52c207acb177a943f2b684c14c48f59fa406239d4636e95ff35157e82dac0af95682d4427c46
+SHA512 (rustyline-6.2.0.crate) = 6b610c091d4217e7f06fdfbe30cf285c7003f5f37096b9c02a789dddae6c0be443d821f788da921666ece1ffcfda2b0c3ba0630fa15c03e1cd6edd8b6b298c43