Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-python-cjson for
openSUSE:Factory checked in at 2021-01-20 18:29:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-python-cjson (Old)
and /work/SRC/openSUSE:Factory/.python-python-cjson.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-python-cjson"
Wed Jan 20 18:29:07 2021 rev:5 rq:865003 version:1.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-python-cjson/python-python-cjson.changes
2020-08-06 10:42:35.782134348 +0200
+++
/work/SRC/openSUSE:Factory/.python-python-cjson.new.28504/python-python-cjson.changes
2021-01-20 18:29:26.091628300 +0100
@@ -1,0 +2,5 @@
+Wed Jan 20 10:16:09 UTC 2021 - John Vandenberg <jay...@gmail.com>
+
+- Fix Tumbleweed multi Python 3 builds
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-python-cjson.spec ++++++
--- /var/tmp/diff_new_pack.AOZhSo/_old 2021-01-20 18:29:26.591628758 +0100
+++ /var/tmp/diff_new_pack.AOZhSo/_new 2021-01-20 18:29:26.595628762 +0100
@@ -47,36 +47,44 @@
%prep
%setup -q -n python-cjson-%{version}
+cp jsontest.py jsontest2.py
%if %{with python2}
-cp cjson.c cjson%{python2_bin_suffix}.c
-cp jsontest.py jsontest%{python2_bin_suffix}.py
+cp cjson.c cjson2.c
%endif
%patch0 -p1
-cp cjson.c cjson%{python3_bin_suffix}.c
+cp cjson.c cjson3.c
-cp jsontest.py jsontest%{python3_bin_suffix}.py
+cp jsontest.py jsontest3.py
# Workaround dict order differences on Python 3.4
if [ %{python3_bin_suffix} = '3.4' ]; then
- sed -i 's/\(testWriteComplexArray\|testWriteSmallObject\)/_\1/'
jsontest%{python3_bin_suffix}.py
+ sed -i 's/\(testWriteComplexArray\|testWriteSmallObject\)/_\1/' jsontest3.py
fi
%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
+%{python_expand #
rm cjson.c
-ln -s cjson%{python3_bin_suffix}.c cjson.c
-%python3_build
+if [ "$python" == "python2" ]; then
+ ln -s cjson2.c cjson.c
+else
+ ln -s cjson3.c cjson.c
+fi
+%{$python_build}
+}
%install
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitearch}
%check
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python
jsontest%{$python_bin_suffix}.py
+%{python_expand # run test
+if [ "$python" == "python2" ]; then
+ python_major_ver=2
+else
+ python_major_ver=3
+fi
+PYTHONPATH=%{buildroot}%{$python_sitearch} $python
jsontest${python_major_ver}.py -v
+}
%files %{python_files}
%doc ChangeLog README
