diff --git a/backport-various-clean-ups.patch b/backport-various-clean-ups.patch
new file mode 100644
index 0000000000000000000000000000000000000000..92108edb80141512d6e82583484da38962f9b45d
--- /dev/null
+++ b/backport-various-clean-ups.patch
@@ -0,0 +1,77 @@
+diff -apurN canonicaljson-2.0.0/setup.py canonicaljson-2.0.0-new/setup.py
+--- canonicaljson-2.0.0/setup.py	1970-01-01 08:00:00.000000000 +0800
++++ canonicaljson-2.0.0-new/setup.py	2024-07-31 15:34:31.866702946 +0800
+@@ -0,0 +1,7 @@
++#!/usr/bin/env python
++from setuptools import setup
++if __name__ == "__main__":
++    setup(
++        name = "canonicaljson",
++        version = "1.6.5",
++)
+diff -apurN canonicaljson-2.0.0/tests/test_canonicaljson.py canonicaljson-2.0.0-new/tests/test_canonicaljson.py
+--- canonicaljson-2.0.0/tests/test_canonicaljson.py	2023-03-15 09:13:08.000000000 +0800
++++ canonicaljson-2.0.0-new/tests/test_canonicaljson.py	2024-07-31 15:48:33.230736194 +0800
+@@ -13,9 +13,9 @@
+ # 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 unittest.mock import Mock
+-
++import unittest
+ from math import inf, nan
++from unittest.mock import Mock
+ 
+ from canonicaljson import (
+     encode_canonical_json,
+@@ -25,8 +25,6 @@ from canonicaljson import (
+     register_preserialisation_callback,
+ )
+ 
+-import unittest
+-
+ 
+ class TestCanonicalJson(unittest.TestCase):
+     def test_encode_canonical(self) -> None:
+@@ -34,7 +32,7 @@ class TestCanonicalJson(unittest.TestCas
+ 
+         # ctrl-chars should be encoded.
+         self.assertEqual(
+-            encode_canonical_json(u"text\u0003\r\n"),
++            encode_canonical_json("text\u0003\r\n"),
+             b'"text\\u0003\\r\\n"',
+         )
+ 
+@@ -46,20 +44,20 @@ class TestCanonicalJson(unittest.TestCas
+ 
+         # non-ascii should come out utf8-encoded.
+         self.assertEqual(
+-            encode_canonical_json({u"la merde amusée": u"💩"}),
++            encode_canonical_json({"la merde amusée": "💩"}),
+             b'{"la merde amus\xc3\xa9e":"\xF0\x9F\x92\xA9"}',
+         )
+ 
+         # so should U+2028 and U+2029
+         self.assertEqual(
+-            encode_canonical_json({u"spaces": u"\u2028 \u2029"}),
++            encode_canonical_json({"spaces": "\u2028 \u2029"}),
+             b'{"spaces":"\xe2\x80\xa8 \xe2\x80\xa9"}',
+         )
+ 
+         # but we need to watch out for 'u1234' after backslash, which should
+         # get encoded to an escaped backslash, followed by u1234
+         self.assertEqual(
+-            encode_canonical_json(u"\\u1234"),
++            encode_canonical_json("\\u1234"),
+             b'"\\\\u1234"',
+         )
+ 
+@@ -102,7 +100,7 @@ class TestCanonicalJson(unittest.TestCas
+ 
+         # non-ascii should come out utf8-encoded.
+         self.assertEqual(
+-            encode_pretty_printed_json({u"la merde amusée": u"💩"}),
++            encode_pretty_printed_json({"la merde amusée": "💩"}),
+             b'{\n    "la merde amus\xc3\xa9e": "\xF0\x9F\x92\xA9"\n}',
+         )
+ 
diff --git a/python-canonicaljson.spec b/python-canonicaljson.spec
index e8dc55d7ae0169228e229cad20743af7095a7c9a..e21408743b9bd9987ff6ac3326739f4d542b1a6d 100644
--- a/python-canonicaljson.spec
+++ b/python-canonicaljson.spec
@@ -1,7 +1,7 @@
 %global _empty_manifest_terminate_build 0
 Name:		python-canonicaljson
 Version:	2.0.0
-Release:	1
+Release:	2
 Summary:	Canonical JSON
 License:	Apache-2.0
 URL:		https://github.com/matrix-org/python-canonicaljson
@@ -12,6 +12,8 @@ BuildArch:	noarch
 Requires:	python3-frozendict
 Requires:	python3-simplejson
 
+Patch1:		backport-various-clean-ups.patch
+
 %description
 Canonical JSON
 
@@ -33,7 +35,7 @@ Provides:	python3-canonicaljson-doc
 Canonical JSON
 
 %prep
-%autosetup -n canonicaljson-%{version}
+%autosetup -n canonicaljson-%{version} -p1
 cp %{SOURCE1} ./
 
 %build
@@ -74,6 +76,9 @@ mv %{buildroot}/doclist.lst .
 %{_docdir}/*
 
 %changelog
+* Mon Jul 29 2024 lifeifei <lifeifei@kylinos.cn> - 2.0.0-2
+- Migration patch from upstream:Various clean-ups.
+
 * Thu Mar 16 2023 wubijie <wubijie@kylinos.cn> - 2.0.0-1
 - Update package to version 2.0.0