From 673377ac8593c2eec4bc3aeada950e4779b3e8be Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@redhat.com>
Date: Fri, 17 Jan 2020 14:10:15 +0000
Subject: [PATCH] Upstream version bump

---
 .gitignore                                    |  1 +
 ...79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch | 26 -------------------
 sources                                       |  2 +-
 xtensor.spec                                  | 10 +++----
 4 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch

diff --git a/.gitignore b/.gitignore
index 6251717..899f3d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /xtensor-0.20.8.tar.gz
+/xtensor-0.21.2.tar.gz
diff --git a/842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch b/842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch
deleted file mode 100644
index f0e1d17..0000000
--- a/842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 842d79cc7aea882ad69dfe5ebcd6ad8a7be24624 Mon Sep 17 00:00:00 2001
-From: Zhihao Yuan <zy@simplerose.com>
-Date: Sat, 27 Jul 2019 21:08:09 -0500
-Subject: [PATCH] Fix UB when parsing 1-dimension npy
-
----
- include/xtensor/xnpy.hpp      |   2 --
- test/CMakeLists.txt           |   1 +
- test/files/xnpy_files/int.npy | Bin 0 -> 148 bytes
- test/test_xnpy.cpp            |   5 +++++
- 4 files changed, 6 insertions(+), 2 deletions(-)
- create mode 100644 test/files/xnpy_files/int.npy
-
-diff --git a/include/xtensor/xnpy.hpp b/include/xtensor/xnpy.hpp
-index a3479a62..20b3c63c 100644
---- a/include/xtensor/xnpy.hpp
-+++ b/include/xtensor/xnpy.hpp
-@@ -317,8 +317,6 @@ namespace xt
-                     dim_s = shape_s.substr(pos);
-                 }
- 
--                pop_char(dim_s, ',');
--
-                 if (dim_s.length() == 0)
-                 {
-                     if (pos_next != std::string::npos)
diff --git a/sources b/sources
index 2a4a8b4..8480683 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xtensor-0.20.8.tar.gz) = a014914206a8a0e74056b41f7a059654ff7873a16dc42588146f6e6138df13ff97fc878c11360c36c83511361793fffebd6b02f2c141a68b5fdb040e0aa82324
+SHA512 (xtensor-0.21.2.tar.gz) = c7166bdf3e6d5b8278ef5d3280acb25f44b7ade78d4e3837a1498e9d26175297f8e7611e5748f74d55e3c58674f84a3b4251d56389bb6b04cff8ba71958b0c24
diff --git a/xtensor.spec b/xtensor.spec
index b423473..fb74b7b 100644
--- a/xtensor.spec
+++ b/xtensor.spec
@@ -1,6 +1,6 @@
 Name:           xtensor
-Version:        0.20.8
-Release:        0%{?dist}
+Version:        0.21.2
+Release:        1%{?dist}
 Summary:        C++ tensors with broadcasting and lazy computing
 License:        BSD
 URL:            http://xtensor.readthedocs.io/
@@ -8,9 +8,6 @@ URL:            http://xtensor.readthedocs.io/
 %global github  https://github.com/QuantStack/xtensor
 Source0:        %{github}/archive/%{version}/%{name}-%{version}.tar.gz
 
-#see https://github.com/QuantStack/xtensor/commit/842d79cc7aea882ad69dfe5ebcd6ad8a7be24624
-Patch1:         842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch
-
 # because xtl does so for armv7hl && ppc64le
 # because tests fail for s390x
 ExcludeArch:    armv7hl ppc64le s390x
@@ -68,5 +65,8 @@ Requires:       xsimd-devel
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Jan 16 2020 sguelton@redhat.com - 0.21.2-1
+- Upstream version bump
+
 * Tue Sep 3 2019 sguelton@redhat.com - 0.20.8-1
 - Initial package