From ccb60ee31e85bf7397ed2b35511737fe19c64a8c Mon Sep 17 00:00:00 2001
From: kangenbo <kangenbo@huawei.com>
Date: Thu, 9 Jan 2020 11:25:20 +0800
Subject: [PATCH] update software packages

---
 avoid-unpackaged-for-jsonschema-2.6.0.patch | 58 ---------------------
 python-jsonschema.spec                      | 10 ++--
 2 files changed, 7 insertions(+), 61 deletions(-)
 delete mode 100644 avoid-unpackaged-for-jsonschema-2.6.0.patch

diff --git a/avoid-unpackaged-for-jsonschema-2.6.0.patch b/avoid-unpackaged-for-jsonschema-2.6.0.patch
deleted file mode 100644
index 0c32181..0000000
--- a/avoid-unpackaged-for-jsonschema-2.6.0.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ru jsonschema-2.6.0.orig/jsonschema/compat.py jsonschema-2.6.0/jsonschema/compat.py
---- jsonschema-2.6.0.orig/jsonschema/compat.py	2015-11-30 13:58:04.000000000 +0100
-+++ jsonschema-2.6.0/jsonschema/compat.py	2017-07-21 12:57:25.768508757 +0200
-@@ -8,6 +8,7 @@
-     from collections.abc import MutableMapping, Sequence  # noqa
- 
- PY3 = sys.version_info[0] >= 3
-+PY27 = sys.version_info[:2] == (2, 7)
- 
- if PY3:
-     zip = zip
-@@ -32,8 +33,10 @@
-     int_types = int, long
-     iteritems = operator.methodcaller("iteritems")
- 
--    from functools32 import lru_cache
--
-+    if PY27:
-+        from repoze.lru import lru_cache
-+    else:
-+        from functools32 import lru_cache
- 
- # On python < 3.3 fragments are not handled properly with unknown schemes
- def urlsplit(url):
-diff -ru jsonschema-2.6.0.orig/setup.py jsonschema-2.6.0/setup.py
---- jsonschema-2.6.0.orig/setup.py	2016-08-28 04:29:36.000000000 +0200
-+++ jsonschema-2.6.0/setup.py	2017-07-21 13:28:06.503903938 +0200
-@@ -1,6 +1,7 @@
- import os
- 
- from setuptools import setup
-+from jsonschema import _version
- 
- 
- with open(os.path.join(os.path.dirname(__file__), "README.rst")) as readme:
-@@ -22,14 +23,14 @@
- 
- extras_require = {
-     "format" : ["rfc3987", "strict-rfc3339", "webcolors"],
--    ":python_version=='2.7'": ["functools32"],
-+    ":python_version=='2.7'": ["repoze.lru"],
- }
- 
- setup(
-     name="jsonschema",
-+    version=_version.__version__,
-     packages=["jsonschema", "jsonschema.tests"],
-     package_data={"jsonschema": ["schemas/*.json"]},
--    setup_requires=["vcversioner>=2.16.0.0"],
-     extras_require=extras_require,
-     author="Julian Berman",
-     author_email="Julian@GrayVines.com",
-@@ -39,5 +40,4 @@
-     long_description=long_description,
-     url="http://github.com/Julian/jsonschema",
-     entry_points={"console_scripts": ["jsonschema = jsonschema.cli:main"]},
--    vcversioner={"version_module_paths" : ["jsonschema/_version.py"]},
- )
diff --git a/python-jsonschema.spec b/python-jsonschema.spec
index c4af21e..04cafe2 100644
--- a/python-jsonschema.spec
+++ b/python-jsonschema.spec
@@ -5,7 +5,7 @@ jsonschema is JSON Schema validator currently based on http://tools.ietf.org/htm
 
 Name:           python-%{pypi_name}
 Version:        2.6.0
-Release:        6
+Release:        7
 Summary:        An implementation of JSON Schema validation for Python
 License:        MIT
 URL:            http://pypi.python.org/pypi/jsonschema
@@ -17,8 +17,6 @@ BuildRequires:  python2-devel python2-nose python2-mock python2-repoze-lru
 BuildRequires:  python%{python3_pkgversion}-devel python%{python3_pkgversion}-nose python%{python3_pkgversion}-mock
 %endif
 
-Patch0: avoid-unpackaged-for-jsonschema-2.6.0.patch
-
 %description %{_description}
 
 %package -n python2-%{pypi_name}
@@ -79,5 +77,11 @@ mv %{buildroot}%{_bindir}/jsonschema %{buildroot}%{_bindir}/jsonschema-3
 %doc README.rst PKG-INFO
 
 %changelog
+* Thu Jan 09 2020 kangenbo<kangenbo@huawei.com> - 2.6.0-7
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:update software package
+
 * Sun Sep 15 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.6.0-6
 - Package init
-- 
Gitee