From f3455524cbd4ce41f2c510b68affb7a081304c34 Mon Sep 17 00:00:00 2001 From: Kushal Das Date: Jun 07 2020 07:53:48 +0000 Subject: Updates to 3.0.0 --- diff --git a/.gitignore b/.gitignore index ccee22b..8876128 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /ujson-1.35.tar.gz /ultrajson-2f1d4874f4f4d2a40a460678004c80e69387c663.tar.gz /ujson-2.0.3.tar.gz +/ujson-3.0.0.tar.gz diff --git a/0001-Use-double-conversion-from-the-system.patch b/0001-Use-double-conversion-from-the-system.patch new file mode 100644 index 0000000..78b497c --- /dev/null +++ b/0001-Use-double-conversion-from-the-system.patch @@ -0,0 +1,43 @@ +From 91ab320957b15188c63a280133a71ae3fdb2e758 Mon Sep 17 00:00:00 2001 +From: Kushal Das +Date: Sun, 7 Jun 2020 13:11:55 +0530 +Subject: [PATCH] Use double-conversion from the system + +--- + setup.py | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/setup.py b/setup.py +index 87b96fa..47c409c 100644 +--- a/setup.py ++++ b/setup.py +@@ -17,22 +17,20 @@ Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3 :: Only + """ + +-dconv_source_files = glob("./deps/double-conversion/double-conversion/*.cc") +-dconv_source_files.append("./lib/dconv_wrapper.cc") + + module1 = Extension( + "ujson", +- sources=dconv_source_files +- + [ ++ sources=[ ++ "./lib/dconv_wrapper.cc", + "./python/ujson.c", + "./python/objToJSON.c", + "./python/JSONtoObj.c", + "./lib/ultrajsonenc.c", + "./lib/ultrajsondec.c", + ], +- include_dirs=["./python", "./lib", "./deps/double-conversion/double-conversion"], ++ include_dirs=["./python", "./lib", "/usr/include/double-conversion"], + extra_compile_args=["-D_GNU_SOURCE"], +- extra_link_args=["-lstdc++", "-lm"], ++ extra_link_args=["-lstdc++", "-lm", "-ldouble-conversion"], + ) + + +-- +2.26.2 + diff --git a/0001-Use-system-wide-double-conversion.patch b/0001-Use-system-wide-double-conversion.patch deleted file mode 100644 index 13042e1..0000000 --- a/0001-Use-system-wide-double-conversion.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6f7d2565037b4a85bdc0da69da59be876327e166 Mon Sep 17 00:00:00 2001 -From: Igor Raits -Date: Tue, 12 May 2020 06:15:45 +0200 -Subject: [PATCH] Use system-wide double-conversion - -Signed-off-by: Igor Raits ---- - setup.py | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/setup.py b/setup.py -index 06eb031..53d72cd 100644 ---- a/setup.py -+++ b/setup.py -@@ -18,22 +18,19 @@ Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - """ - --dconv_source_files = glob("./deps/double-conversion/double-conversion/*.cc") --dconv_source_files.append("./lib/dconv_wrapper.cc") -- - module1 = Extension( - "ujson", -- sources=dconv_source_files -- + [ -+ sources=[ -+ "./lib/dconv_wrapper.cc", - "./python/ujson.c", - "./python/objToJSON.c", - "./python/JSONtoObj.c", - "./lib/ultrajsonenc.c", - "./lib/ultrajsondec.c", - ], -- include_dirs=["./python", "./lib", "./deps/double-conversion/double-conversion"], -+ include_dirs=["./python", "./lib", "/usr/include/double-conversion"], - extra_compile_args=["-D_GNU_SOURCE"], -- extra_link_args=["-lstdc++", "-lm"], -+ extra_link_args=["-lstdc++", "-lm", "-ldouble-conversion"], - ) - - --- -2.26.2 - diff --git a/python-ujson.spec b/python-ujson.spec index ee37895..0daf75d 100644 --- a/python-ujson.spec +++ b/python-ujson.spec @@ -2,8 +2,8 @@ %global srcname ultrajson Name: python-%{modname} -Version: 2.0.3 -Release: 2%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: Ultra fast JSON encoder and decoder written in pure C License: BSD @@ -15,7 +15,7 @@ BuildRequires: gcc-c++ BuildRequires: double-conversion-devel %patchlist -0001-Use-system-wide-double-conversion.patch +0001-Use-double-conversion-from-the-system.patch %global _description \ UltraJSON is an ultra fast JSON encoder and decoder written in\ @@ -55,6 +55,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %python3 -m pytest -v %{python3_sitearch}/%{modname}*.so %changelog +* Sun Jun 07 2020 Kushal Das 3.0.0-1 +- Update to 3.0.0 + * Tue May 26 2020 Miro HronĨok - 2.0.3-2 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 19a3e4b..b114b90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ujson-2.0.3.tar.gz) = 2c1879c372745966a00e064559dbf615f282ef192cbdbb29243c48169fc5f6e9344eba29988a1de3b5b0d1fe7699fcd88373d6dbb2e3fb59b1e8ef12b8a0375d +SHA512 (ujson-3.0.0.tar.gz) = 058675627c1275df1dbada02fca3750e544e25c0d0842b4a4268a664456cae1869423d832b7e4af40e56168b687ec711adf124e9ab34b7c06a244b61f7e2fdfc