From fce912f84337db4282feec03cee923d39335d6e1 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 4 Jun 2019 18:00:03 -0700
Subject: [PATCH] Bump nix to 0.14

---
 0001-tuikit-update-to-v0.2.7.patch | 36 ++++++++++++++++++++++++++++++
 rust-skim.spec                     | 15 ++++++++++---
 skim-fix-metadata.diff             | 20 +++++++++++++++++
 3 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 0001-tuikit-update-to-v0.2.7.patch
 create mode 100644 skim-fix-metadata.diff

diff --git a/0001-tuikit-update-to-v0.2.7.patch b/0001-tuikit-update-to-v0.2.7.patch
new file mode 100644
index 0000000..976a336
--- /dev/null
+++ b/0001-tuikit-update-to-v0.2.7.patch
@@ -0,0 +1,36 @@
+From 3c1d0dc3a6587339025bd0ac4678d05db3918116 Mon Sep 17 00:00:00 2001
+From: Jinzhou Zhang <lotabout@gmail.com>
+Date: Tue, 4 Jun 2019 09:35:35 +0800
+Subject: [PATCH] [tuikit] update to v0.2.7
+
+---
+ src/model.rs | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/model.rs b/src/model.rs
+index cea798193510..91ebea88f628 100644
+--- a/src/model.rs
++++ b/src/model.rs
+@@ -564,16 +564,16 @@ impl Draw for Model {
+ 
+         let win_selection = Win::new(&self.selection);
+         let win_query = Win::new(&self.query)
+-            .basis(if self.inline_info { 0 } else { 1 }.into())
++            .basis(if self.inline_info { 0 } else { 1 })
+             .grow(0)
+             .shrink(0);
+         let win_status = Win::new(&status)
+-            .basis(if self.inline_info { 0 } else { 1 }.into())
++            .basis(if self.inline_info { 0 } else { 1 })
+             .grow(0)
+             .shrink(0);
+         let win_header = Win::new(&self.header).grow(0).shrink(0);
+         let win_query_status = HSplit::default()
+-            .basis(if self.inline_info { 1 } else { 0 }.into())
++            .basis(if self.inline_info { 1 } else { 0 })
+             .grow(0)
+             .shrink(0)
+             .split(Win::new(&self.query).grow(0).shrink(0))
+-- 
+2.21.0
+
diff --git a/rust-skim.spec b/rust-skim.spec
index 7c19272..c378449 100644
--- a/rust-skim.spec
+++ b/rust-skim.spec
@@ -5,12 +5,18 @@
 
 Name:           rust-%{crate}
 Version:        0.6.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fuzzy Finder in Rust
 
 License:        MIT
 URL:            https://crates.io/crates/skim
 Source:         %{crates_source}
+# Initial patched metadata
+# * Bump nix to 0.14, https://github.com/lotabout/skim/pull/185
+# * Bump tuikit to 0.2.7, https://github.com/lotabout/skim/pull/184/commits/3c1d0dc3a6587339025bd0ac4678d05db3918116
+Patch0:         skim-fix-metadata.diff
+Patch1:         0001-tuikit-update-to-v0.2.7.patch
+
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
@@ -22,13 +28,13 @@ BuildRequires:  (crate(env_logger/default) >= 0.6.1 with crate(env_logger/defaul
 BuildRequires:  (crate(fuzzy-matcher/default) >= 0.2.1 with crate(fuzzy-matcher/default) < 0.3.0)
 BuildRequires:  (crate(lazy_static/default) >= 1.3.0 with crate(lazy_static/default) < 2.0.0)
 BuildRequires:  (crate(log/default) >= 0.4.6 with crate(log/default) < 0.5.0)
-BuildRequires:  (crate(nix/default) >= 0.13.0 with crate(nix/default) < 0.14.0)
+BuildRequires:  (crate(nix/default) >= 0.14.0 with crate(nix/default) < 0.15.0)
 BuildRequires:  (crate(rayon/default) >= 1.0.3 with crate(rayon/default) < 2.0.0)
 BuildRequires:  (crate(regex/default) >= 1.1.5 with crate(regex/default) < 2.0.0)
 BuildRequires:  (crate(shlex/default) >= 0.1.1 with crate(shlex/default) < 0.2.0)
 BuildRequires:  (crate(time/default) >= 0.1.38 with crate(time/default) < 0.2.0)
 BuildRequires:  (crate(timer/default) >= 0.2.0 with crate(timer/default) < 0.3.0)
-BuildRequires:  (crate(tuikit/default) >= 0.2.6 with crate(tuikit/default) < 0.3.0)
+BuildRequires:  (crate(tuikit/default) >= 0.2.7 with crate(tuikit/default) < 0.3.0)
 BuildRequires:  (crate(unicode-width/default) >= 0.1.4 with crate(unicode-width/default) < 0.2.0)
 BuildRequires:  (crate(vte/default) >= 0.3.3 with crate(vte/default) < 0.4.0)
 
@@ -126,6 +132,9 @@ install -Dpm0644 shell/key-bindings.* %{buildroot}%{_datadir}/skim/shell/
 %endif
 
 %changelog
+* Wed Jun 05 2019 Josh Stone <jistone@redhat.com> - 0.6.7-2
+- Bump nix to 0.14
+
 * Fri May 31 20:09:57 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0.6.7-1
 - Release 0.6.7
 
diff --git a/skim-fix-metadata.diff b/skim-fix-metadata.diff
new file mode 100644
index 0000000..6fffa54
--- /dev/null
+++ b/skim-fix-metadata.diff
@@ -0,0 +1,20 @@
+--- skim-0.6.7/Cargo.toml	1970-01-01T00:00:00+00:00
++++ skim-0.6.7/Cargo.toml	2019-06-05T00:49:10.425754+00:00
+@@ -58,7 +58,7 @@
+ version = "0.4.6"
+ 
+ [dependencies.nix]
+-version = "0.13.0"
++version = "0.14.0"
+ 
+ [dependencies.rayon]
+ version = "1.0.3"
+@@ -76,7 +76,7 @@
+ version = "0.2.0"
+ 
+ [dependencies.tuikit]
+-version = "0.2.6"
++version = "0.2.7"
+ 
+ [dependencies.unicode-width]
+ version = "0.1.4"