Hello community,
here is the log from the commit of package python-python-cjson for
openSUSE:Factory checked in at 2020-05-01 11:12:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-python-cjson (Old)
and /work/SRC/openSUSE:Factory/.python-python-cjson.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-python-cjson"
Fri May 1 11:12:42 2020 rev:3 rq:799132 version:1.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-python-cjson/python-python-cjson.changes
2019-06-19 21:03:07.938226926 +0200
+++
/work/SRC/openSUSE:Factory/.python-python-cjson.new.2738/python-python-cjson.changes
2020-05-01 11:12:52.331784683 +0200
@@ -1,0 +2,5 @@
+Thu Apr 30 07:26:40 UTC 2020 - Tomáš Chvátal <[email protected]>
+
+- Fix build without python2
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-python-cjson.spec ++++++
--- /var/tmp/diff_new_pack.Kh1yjM/_old 2020-05-01 11:12:53.799787875 +0200
+++ /var/tmp/diff_new_pack.Kh1yjM/_new 2020-05-01 11:12:53.799787875 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-python-cjson
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,14 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without python2
Name: python-python-cjson
Version: 1.2.1
Release: 0
Summary: C-accelerated JSON encoder/decoder for Python
License: LGPL-2.0-or-later
Group: Development/Languages/Python
-Url: https://github.com/AGProjects/python-cjson
+URL: https://github.com/AGProjects/python-cjson
Source:
https://files.pythonhosted.org/packages/source/p/python-cjson/python-cjson-%{version}.tar.gz
# https://github.com/AGProjects/python-cjson/issues/6
Patch0: py3.patch
@@ -46,8 +47,10 @@
%prep
%setup -q -n python-cjson-%{version}
+%if %{with python2}
cp cjson.c cjson%{python2_bin_suffix}.c
cp jsontest.py jsontest%{python2_bin_suffix}.py
+%endif
%patch0 -p1
cp cjson.c cjson%{python3_bin_suffix}.c
@@ -59,9 +62,11 @@
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
+%if %{with python2}
rm cjson.c
ln -s cjson%{python2_bin_suffix}.c cjson.c
%python2_build
+%endif
rm cjson.c
ln -s cjson%{python3_bin_suffix}.c cjson.c
%python3_build