From e2dc0d17d09fa58189ea67784d903e932cba677a99c6a6a7f3a585189f33cd62 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Sat, 18 Sep 2021 16:16:50 +0000
Subject: [PATCH] Accepting request 920055 from
 home:theMarix:branches:devel:languages:python

- Update to 1.5.0
  * Emojis of English version updated to the Emoji Charts v14.0
- Drop obsolete `fix-python2.patch` that has been merged upstream.

OBS-URL: https://build.opensuse.org/request/show/920055
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-emoji?expand=0&rev=23
---
 emoji-1.4.2.tar.gz   |  3 ---
 emoji-1.5.0.tar.gz   |  3 +++
 fix-python2.patch    | 22 ----------------------
 python-emoji.changes |  7 +++++++
 python-emoji.spec    |  3 +--
 5 files changed, 11 insertions(+), 27 deletions(-)
 delete mode 100644 emoji-1.4.2.tar.gz
 create mode 100644 emoji-1.5.0.tar.gz
 delete mode 100644 fix-python2.patch

diff --git a/emoji-1.4.2.tar.gz b/emoji-1.4.2.tar.gz
deleted file mode 100644
index 7649149..0000000
--- a/emoji-1.4.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21257f311e24468031e85685867c00b87249dc7612b82dc763a771ba5fb00c01
-size 184985
diff --git a/emoji-1.5.0.tar.gz b/emoji-1.5.0.tar.gz
new file mode 100644
index 0000000..da7fd7c
--- /dev/null
+++ b/emoji-1.5.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2eddd062f940924fb25a3108d84d77dc571927d91a419b4c30f37e253c791b19
+size 185955
diff --git a/fix-python2.patch b/fix-python2.patch
deleted file mode 100644
index 9ddb72d..0000000
--- a/fix-python2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Matthias Bach <marix@marix.org>
-Date: 2021-07-31 11:57:53 2021 +0200
-Subject: Fix matching of non-ASCII emoji names on Python 2
-References: https://github.com/carpedm20/emoji/pull/181
-Upstream: merged
-
-A fix to get the tests passing for the French language in 1.4.1 sadly was incomplete and only worked for Python 3. This extends the patch to also work on Python 2.
-
-
-diff --git a/emoji/core.py b/emoji/core.py
-index 7221937..ade232e 100644
---- a/emoji/core.py
-+++ b/emoji/core.py
-@@ -55,7 +55,7 @@ def emojize(
-         Python is fun ❤️ #red heart, not black heart
-     """
-     EMOJI_UNICODE = unicode_codes.EMOJI_UNICODE[language]
--    pattern = re.compile(u'(%s[\\w\\-&.’”“()!#*+?–,/]+%s)' % delimiters)
-+    pattern = re.compile(u'(%s[\\w\\-&.’”“()!#*+?–,/]+%s)' % delimiters, flags=re.UNICODE)
- 
-     def replace(match):
-         mg = match.group(1).replace(delimiters[0], _DEFAULT_DELIMITER).replace(
diff --git a/python-emoji.changes b/python-emoji.changes
index dcd5b63..467d0be 100644
--- a/python-emoji.changes
+++ b/python-emoji.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Sep 18 10:19:22 UTC 2021 - Matthias Bach <marix@marix.org> - 1.5.0
+
+- Update to 1.5.0
+  * Emojis of English version updated to the Emoji Charts v14.0
+- Drop obsolete `fix-python2.patch` that has been merged upstream.
+
 -------------------------------------------------------------------
 Wed Aug  4 19:23:18 UTC 2021 - Matthias Bach <marix@marix.org> - 1.4.2
 
diff --git a/python-emoji.spec b/python-emoji.spec
index a4cc4df..0fe19a3 100644
--- a/python-emoji.spec
+++ b/python-emoji.spec
@@ -18,14 +18,13 @@
 
 
 Name:           python-emoji
-Version:        1.4.2
+Version:        1.5.0
 Release:        0
 Summary:        Emoji for Python
 License:        BSD-3-Clause
 Group:          Development/Languages/Python
 URL:            https://github.com/carpedm20/emoji/
 Source:         https://files.pythonhosted.org/packages/source/e/emoji/emoji-%{version}.tar.gz
-Patch1:         fix-python2.patch
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes