From 14a16377aca01a27b5054db5a3a34985e2268a7db1f1cb7e54788829937e697f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 16 Jan 2020 08:58:13 +0000
Subject: [PATCH] - Update to 1.0.1:   * Permit all allowed values of codec
 errors (see #86)   * BUGFIX: READEME.md has UTF-8 characters, setup.py will
 fail on systems where the locale is not UTF-8. (see #89) - Drop merged patch
 0002-Fix-README.md-has-unicode.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-hiredis?expand=0&rev=7
---
 0002-Fix-README.md-has-unicode.patch | 34 ----------------------------
 python-hiredis.changes               |  8 +++++++
 python-hiredis.spec                  |  6 ++---
 v1.0.0.tar.gz                        |  3 ---
 v1.0.1.tar.gz                        |  3 +++
 5 files changed, 13 insertions(+), 41 deletions(-)
 delete mode 100644 0002-Fix-README.md-has-unicode.patch
 delete mode 100644 v1.0.0.tar.gz
 create mode 100644 v1.0.1.tar.gz

diff --git a/0002-Fix-README.md-has-unicode.patch b/0002-Fix-README.md-has-unicode.patch
deleted file mode 100644
index d66d5c3..0000000
--- a/0002-Fix-README.md-has-unicode.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Matthias Fehring <buschmann23@opensuse.org>
-Date: 2019-09-17 23:42:00 +0200
-Subject: README.md has unicode in it
-Upstream: merged (https://github.com/redis/hiredis-py/pull/89)
-
-When reading the description in setup.py the wrong encoding is
-selected for the text files.
-
----
- setup.py |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index bc8a95c..7ec9a5b 100755
---- a/setup.py
-+++ b/setup.py
-@@ -4,7 +4,7 @@
-   from setuptools import setup, Extension
- except ImportError:
-   from distutils.core import setup, Extension
--import sys, imp, os, glob
-+import sys, imp, os, glob, io
-
- def version():
-   module = imp.load_source("hiredis.version", "hiredis/version.py")
-@@ -19,7 +19,7 @@ def version():
-   name="hiredis",
-   version=version(),
-   description="Python wrapper for hiredis",
--  long_description=open('README.md', 'r').read(),
-+  long_description=io.open('README.md', 'rt', encoding='utf-8').read(),
-   long_description_content_type='text/markdown',
-   url="https://github.com/redis/hiredis-py",
-   author="Jan-Erik Rediger, Pieter Noordhuis",
diff --git a/python-hiredis.changes b/python-hiredis.changes
index 6d6c342..66a4886 100644
--- a/python-hiredis.changes
+++ b/python-hiredis.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jan 16 08:54:49 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 1.0.1:
+  * Permit all allowed values of codec errors (see #86)
+  * BUGFIX: READEME.md has UTF-8 characters, setup.py will fail on systems where the locale is not UTF-8. (see #89)
+- Drop merged patch 0002-Fix-README.md-has-unicode.patch
+
 -------------------------------------------------------------------
 Tue Sep 17 21:45:19 UTC 2019 - Matthias Fehring <buschmann23@opensuse.org>
 
diff --git a/python-hiredis.spec b/python-hiredis.spec
index 5253e43..02ef538 100644
--- a/python-hiredis.spec
+++ b/python-hiredis.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-hiredis
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,17 +18,15 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-hiredis
-Version:        1.0.0
+Version:        1.0.1
 Release:        0
 Summary:        Python wrapper for hiredis
 License:        BSD-3-Clause
-Group:          Development/Languages/Python
 URL:            https://github.com/redis/hiredis-py
 Source:         https://github.com/redis/hiredis-py/archive/v%{version}.tar.gz
 Patch0:         0001-Use-system-libhiredis.patch
 Patch1:         fix_build_dir_in_tests.patch
 Patch2:         drop-vendor-sources.patch
-Patch3:         0002-Fix-README.md-has-unicode.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
diff --git a/v1.0.0.tar.gz b/v1.0.0.tar.gz
deleted file mode 100644
index 5aecf66..0000000
--- a/v1.0.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9eb3f262f60af8953945742ee201d13c0eb94ba6f89db8664d44f27a9ac2aeb8
-size 14076
diff --git a/v1.0.1.tar.gz b/v1.0.1.tar.gz
new file mode 100644
index 0000000..6400d27
--- /dev/null
+++ b/v1.0.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2970b6123b071d8f2abf4f87f2cbeb6cfd698036b9a1b713c052361e3c2849c0
+size 14215