Hello community, here is the log from the commit of package python-afdko for openSUSE:Factory checked in at 2020-06-26 21:48:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-afdko (Old) and /work/SRC/openSUSE:Factory/.python-afdko.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-afdko" Fri Jun 26 21:48:12 2020 rev:2 rq:817065 version:3.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-afdko/python-afdko.changes 2020-06-25 15:07:50.565442826 +0200 +++ /work/SRC/openSUSE:Factory/.python-afdko.new.3060/python-afdko.changes 2020-06-26 21:48:46.690471502 +0200 @@ -1,0 +2,19 @@ +Fri Jun 12 13:44:19 UTC 2020 - Antonio Larrosa <alarr...@suse.com> + +- Add patch to skip tests that fail in i586. See + https://github.com/adobe-type-tools/afdko/issues/1163 : + * skip-tests-failing-on-i586.patch + +------------------------------------------------------------------- +Fri Jun 12 07:36:28 UTC 2020 - Antonio Larrosa <alarr...@suse.com> + +- Use update-alternatives to provide a tx symlink to afdko-tx. + This works around the issue of having tx binaries different + packages (python-afdko and transifex-client). + +------------------------------------------------------------------- +Thu Jun 11 15:19:15 UTC 2020 - Antonio Larrosa <alarr...@suse.com> + +- Rename %{_bindir}/tx to afdko-tx + +------------------------------------------------------------------- New: ---- skip-tests-failing-on-i586.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-afdko.spec ++++++ --- /var/tmp/diff_new_pack.m1mABp/_old 2020-06-26 21:48:48.038475816 +0200 +++ /var/tmp/diff_new_pack.m1mABp/_new 2020-06-26 21:48:48.042475829 +0200 @@ -34,6 +34,7 @@ Group: Development/Languages/Python URL: https://github.com/adobe-type-tools/afdko Source: https://files.pythonhosted.org/packages/source/a/afdko/afdko-%{version}.tar.gz +Patch0: skip-tests-failing-on-i586.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} @@ -81,6 +82,7 @@ %prep %setup -q -n afdko-%{version} +%patch0 -p1 %if %{with test} %check @@ -95,34 +97,46 @@ %install %python_install +mv %{buildroot}%{_bindir}/tx %{buildroot}%{_bindir}/afdko-tx for binary in detype1 makeotfexe mergefonts rotatefont sfntdiff sfntedit \ - spot tx type1 autohint buildcff2vf buildmasterotfs \ + spot afdko-tx type1 autohint buildcff2vf buildmasterotfs \ comparefamily checkoutlinesufo makeotf makeinstancesufo \ otc2otf otf2otc otf2ttf stemhist ttfcomponentizer \ ttfdecomponentizer ttxn charplot digiplot fontplot \ fontplot2 fontsetplot hintplot waterfallplot ; do %python_clone -a %{buildroot}%{_bindir}/$binary done + +ln -s -f %{_sysconfdir}/alternatives/tx %{buildroot}%{_bindir}/tx + %python_expand %fdupes %{buildroot}%{$python_sitelib} %post %{python_install_alternative makeotf detype1 makeotfexe mergefonts rotatefont - sfntdiff sfntedit spot tx type1 autohint buildcff2vf buildmasterotfs + sfntdiff sfntedit spot afdko-tx type1 autohint buildcff2vf buildmasterotfs comparefamily checkoutlinesufo makeinstancesufo otc2otf otf2otc otf2ttf stemhist ttfcomponentizer ttfdecomponentizer ttxn charplot digiplot fontplot fontplot2 fontsetplot hintplot waterfallplot} +%{_sbindir}/update-alternatives --install %{_bindir}/tx tx %{_bindir}/afdko-tx 20 + %postun %{python_uninstall_alternative makeotf detype1 makeotfexe mergefonts rotatefont - sfntdiff sfntedit spot tx type1 autohint buildcff2vf buildmasterotfs + sfntdiff sfntedit spot afdko-tx type1 autohint buildcff2vf buildmasterotfs comparefamily checkoutlinesufo makeinstancesufo otc2otf otf2otc otf2ttf stemhist ttfcomponentizer ttfdecomponentizer ttxn charplot digiplot fontplot fontplot2 fontsetplot hintplot waterfallplot} +if [ ! -e %{_bindir}/afdko-tx ] ; then + %{_sbindir}/update-alternatives --remove tx %{_bindir}/afdko-tx +fi + %files %{python_files} %doc NEWS.md README.md %license LICENSE.md +%ghost %{_sysconfdir}/alternatives/tx +%{_bindir}/tx %python_alternative %{_bindir}/detype1 %python_alternative %{_bindir}/makeotfexe %python_alternative %{_bindir}/mergefonts @@ -130,7 +144,7 @@ %python_alternative %{_bindir}/sfntdiff %python_alternative %{_bindir}/sfntedit %python_alternative %{_bindir}/spot -%python_alternative %{_bindir}/tx +%python_alternative %{_bindir}/afdko-tx %python_alternative %{_bindir}/type1 %python_alternative %{_bindir}/autohint %python_alternative %{_bindir}/buildcff2vf ++++++ skip-tests-failing-on-i586.patch ++++++ Index: afdko-3.4.0/tests/otf2ttf_test.py =================================================================== --- afdko-3.4.0.orig/tests/otf2ttf_test.py +++ afdko-3.4.0/tests/otf2ttf_test.py @@ -1,6 +1,7 @@ from os import path, remove import pytest from time import sleep +import platform from afdko.otf2ttf import main as otf2ttf from afdko.fdkutils import ( @@ -102,6 +103,7 @@ def test_post_overflow(): @pytest.mark.parametrize('filename', ['sans', 'serif', 'latincid', 'kanjicid']) +@pytest.mark.skipif(platform.machine() == 'i686', reason="https://github.com/adobe-type-tools/afdko/issues/1163";) def test_convert(filename): input_path = get_input_path(f'{filename}.otf') actual_path = get_temp_file_path() @@ -150,6 +152,7 @@ def test_skip_ttf(file): @pytest.mark.parametrize('filename', ['otf_ttf', 'ttf_otf', 'ttf_ttf']) +@pytest.mark.skipif(platform.machine() == 'i686', reason="https://github.com/adobe-type-tools/afdko/issues/1163";) def test_skip_ttf_in_ttc(filename): input_path = get_input_path(f'{filename}.ttc') out_path = path.join(get_temp_dir_path(), f'{filename}.ttc') Index: afdko-3.4.0/tests/tx_test.py =================================================================== --- afdko-3.4.0.orig/tests/tx_test.py +++ afdko-3.4.0/tests/tx_test.py @@ -3,6 +3,7 @@ import pytest import re import subprocess import time +import platform from afdko.fdkutils import ( get_temp_file_path, @@ -384,6 +385,7 @@ def test_type1_inputs(file_ext): @pytest.mark.parametrize('args', [[], ['U', '_500,500'], ['U', '_0,0', 'n']]) @pytest.mark.parametrize('fname', ['zx', 'zy']) +@pytest.mark.skipif(platform.machine() == 'i686', reason="https://github.com/adobe-type-tools/afdko/issues/1163";) def test_type1mm_inputs(fname, args): fname2 = f'.{"".join(args)}' if args else '' actual_path = runner(CMD + ['-s', '-f', f'{fname}.pfb', '-o', '2'] + args) @@ -418,6 +420,7 @@ def test_other_input_formats(fext): ['6', 'n'], ]) @pytest.mark.parametrize('font_filename', ['type1.pfa', 'svg.svg']) +@pytest.mark.skipif(platform.machine() == 'i686', reason="https://github.com/adobe-type-tools/afdko/issues/1163";) def test_dump_option(args, font_filename): if any([arg in args for arg in ('4', '5', '6')]): skip = []
