diff --git a/0001-add-setup.py.patch b/0001-add-setup.py.patch deleted file mode 100644 index 8e777c4c9858d44f4f815dcbf2a337f753b259e5..0000000000000000000000000000000000000000 --- a/0001-add-setup.py.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- c/setup.py 1970-01-01 08:00:00.000000000 +0800 -+++ a/setup.py 2022-11-11 15:30:34.261565196 +0800 -@@ -0,0 +1,68 @@ -+#!/usr/bin/env python -+ -+# Copyright 2015 OpenMarket Ltd -+# Copyright 2018 New Vector Ltd -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+ -+from setuptools import setup -+from codecs import open -+import os -+ -+ -+here = os.path.abspath(os.path.dirname(__file__)) -+ -+def read_file(path_segments): -+ """Read a UTF-8 file from the package. Takes a list of strings to join to -+ make the path""" -+ file_path = os.path.join(here, *path_segments) -+ with open(file_path, encoding="utf-8") as f: -+ return f.read() -+ -+def exec_file(path_segments, name): -+ """Extract a constant from a python file by looking for a line defining -+ the constant and executing it.""" -+ result = {} -+ code = read_file(path_segments) -+ lines = [line for line in code.split("\n") if line.startswith(name)] -+ exec("\n".join(lines), result) -+ return result[name] -+ -+ -+setup( -+ name = "canonicaljson", -+ description = "Canonical JSON", -+ long_description = read_file(("README.rst",)), -+ version = exec_file(("src/canonicaljson/__init__.py",), "__version__"), -+ keywords = "json", -+ url = "https://github.com/matrix-org/python-canonicaljson", -+ license = "Apache License, Version 2.0", -+ author = "Matrix.org Team and Contributors", -+ author_email = "packages@matrix.org", -+ license_file = "LICENSE", -+ classifiers = [ -+ "Development Status :: 5 - Production/Stable", -+ "Intended Audience :: Developers", -+ "License :: OSI Approved :: Apache Software License", -+ "Programming Language :: Python :: 2", -+ "Programming Language :: Python :: 3" -+ ], -+ zip_safe = True, -+ python_requires = ">=3.7", -+ package_dir = {"": "src"}, -+ packages = ["canonicaljson",], -+ install_requires = [ -+ "simplejson>=3.14.0", -+ "typing_extensions>=4.0.0; python_version < '3.8'" -+ ] -+) diff --git a/canonicaljson-1.6.4.tar.gz b/canonicaljson-1.6.4.tar.gz deleted file mode 100644 index a80b262e77d09091703ff0dcc5da3f0061ace81a..0000000000000000000000000000000000000000 Binary files a/canonicaljson-1.6.4.tar.gz and /dev/null differ diff --git a/canonicaljson-1.6.5.tar.gz b/canonicaljson-1.6.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..60976093a9afabf084a2a3ce5d0726d72885a457 Binary files /dev/null and b/canonicaljson-1.6.5.tar.gz differ diff --git a/python-canonicaljson.spec b/python-canonicaljson.spec index e6deab10116d54a4f352395fa0ca8ad5b9788638..32f0a18f3f36a4c755dbb202f1d97c027ff7a439 100644 --- a/python-canonicaljson.spec +++ b/python-canonicaljson.spec @@ -1,12 +1,12 @@ %global _empty_manifest_terminate_build 0 Name: python-canonicaljson -Version: 1.6.4 +Version: 1.6.5 Release: 1 Summary: Canonical JSON License: Apache-2.0 URL: https://github.com/matrix-org/python-canonicaljson -Source0: https://files.pythonhosted.org/packages/b8/07/a4632a48f6ea1cbe09e9f0e905c166eff8c946cd4dee17c4202db76007c5/canonicaljson-1.6.4.tar.gz -Patch0: 0001-add-setup.py.patch +Source0: https://files.pythonhosted.org/packages/64/13/017c9bed81f7f5b72470fe5892b25cc212299bd3d79e2d30f2f99c22c517/canonicaljson-1.6.5.tar.gz +Source1: setup.py BuildArch: noarch Requires: python3-frozendict @@ -34,7 +34,7 @@ Canonical JSON %prep %autosetup -n canonicaljson-%{version} -%patch0 +cp %{SOURCE1} ./ %build %py3_build @@ -74,6 +74,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Thu Mar 2 2023 wubijie - 1.6.5-1 +- Update package to version 1.6.5 + * Fri Nov 11 2022 wangjunqi - 1.6.4-1 - Update package to version 1.6.4 diff --git a/setup.py b/setup.py new file mode 100644 index 0000000000000000000000000000000000000000..029f265068f95ffdca2f6a465db98de877c8807e --- /dev/null +++ b/setup.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python +from setuptools import setup +if __name__ == "__main__": + setup( + name = "canonicaljson", + version = "1.6.5", +)