From 34acd2054b5153575dae26322c8c2bd04c9e5bed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Sat, 11 Jan 2020 17:23:38 +0100
Subject: [PATCH] Update to 0.1.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
---
 .gitignore                      | 4 ++++
 rust-terminal_size.spec         | 8 +++++---
 sources                         | 4 ++++
 terminal_size-fix-metadata.diff | 5 +++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ded54c1..ff3dd23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 /terminal_size-0.1.8.crate
+<<<<<<< HEAD
 /terminal_size-0.1.9.crate
+=======
+/terminal_size-0.1.10.crate
+>>>>>>> Update to 0.1.10
diff --git a/rust-terminal_size.spec b/rust-terminal_size.spec
index e156591..770f4a3 100644
--- a/rust-terminal_size.spec
+++ b/rust-terminal_size.spec
@@ -5,7 +5,7 @@
 %global crate terminal_size
 
 Name:           rust-%{crate}
-Version:        0.1.9
+Version:        0.1.10
 Release:        1%{?dist}
 Summary:        Gets the size of your Linux or Windows terminal
 
@@ -70,11 +70,13 @@ which use "default" feature of "%{crate}" crate.
 
 %if %{with check}
 %check
-# stty: /dev/stderr: Inappropriate ioctl for device
-%cargo_test -- -- --skip unix::compare_with_stty
+%cargo_test
 %endif
 
 %changelog
+* Sat Jan 11 17:21:23 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 0.1.10-1
+- Update to 0.1.10
+
 * Tue Jan 07 2020 Josh Stone <jistone@redhat.com> - 0.1.9-1
 - Update to 0.1.9
 
diff --git a/sources b/sources
index 3e520dc..fde56e3 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 SHA512 (terminal_size-0.1.9.crate) = b3e5d840bf33cb49294995d6d1300facba540804b65648c9b77612ebb28baef3eb28477b2aac3048bba66ed51b2afc12fad436677f5221f8ddecfaf2af163a88
+=======
+SHA512 (terminal_size-0.1.10.crate) = ebe617c7329d34270b254d58c107ff941381cc18222a8f9a32e5fe937715de64269d336fdf49caeaa0afc8b88955c402c9650d74af3276f3694f286282400d85
+>>>>>>> Update to 0.1.10
diff --git a/terminal_size-fix-metadata.diff b/terminal_size-fix-metadata.diff
index 7d69ce1..fa82ff4 100644
--- a/terminal_size-fix-metadata.diff
+++ b/terminal_size-fix-metadata.diff
@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 --- terminal_size-0.1.9/Cargo.toml	2020-01-05T23:29:06+00:00
 +++ terminal_size-0.1.9/Cargo.toml	2020-01-07T18:15:14.630826+00:00
+=======
+--- terminal_size-0.1.10/Cargo.toml     2020-01-08T21:21:37+00:00
++++ terminal_size-0.1.10/Cargo.toml     2020-01-11T16:21:22.903179+00:00
+>>>>>>> Update to 0.1.10
 @@ -22,6 +22,3 @@
  repository = "https://github.com/eminence/terminal-size"
  [dependencies.libc]