diff --git a/python-FontTools.changes b/python-FontTools.changes index 339fce0..4372dd6 100644 --- a/python-FontTools.changes +++ b/python-FontTools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 26 06:34:20 UTC 2020 - Petr Gajdos + +- %python3_only -> %python_alternative + ------------------------------------------------------------------- Wed May 20 10:13:15 UTC 2020 - Antonio Larrosa diff --git a/python-FontTools.spec b/python-FontTools.spec index 17c21c6..157fab2 100644 --- a/python-FontTools.spec +++ b/python-FontTools.spec @@ -22,7 +22,6 @@ %else %define psuffix %{nil} %endif - %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-FontTools%{psuffix} @@ -31,7 +30,7 @@ Release: 0 Summary: Suite of Tools and Libraries for Manipulating Fonts License: MIT AND OFL-1.1 Group: Development/Languages/Python -URL: http://github.com/fonttools/fonttools +URL: https://github.com/fonttools/fonttools Source: https://files.pythonhosted.org/packages/source/f/fonttools/fonttools-%{version}.zip Source1: https://raw.githubusercontent.com/fonttools/fonttools/master/Tests/cu2qu/data/curves.json BuildRequires: %{python_module devel} @@ -46,7 +45,11 @@ Requires: python-reportlab Requires: python-scipy >= 1.4.1 Requires: python-sympy Requires: python-unicodedata2 >= 13.0.0 +Requires(post): update-alternatives +Requires(postun): update-alternatives +BuildArch: noarch %if "%{flavor}" == "test" +BuildRequires: zip # SECTION test requirements BuildRequires: %{python_module brotlipy >= 0.7.0} BuildRequires: %{python_module fs >= 2.4.11} @@ -56,14 +59,12 @@ BuildRequires: %{python_module sympy} BuildRequires: %{python_module ufoLib2 >= 0.6.2} BuildRequires: %{python_module zopfli >= 0.1.6} %endif -BuildRequires: zip # /SECTION %ifpython3 Obsoletes: fonttools < %{version} Provides: fonttools = %{version} Provides: python-fonttools = %{version} %endif -BuildArch: noarch %python_subpackages %description @@ -78,7 +79,7 @@ convert TrueType fonts to an XML based format (called TTX) and back. %setup -q -n fonttools-%{version} # Remove shebang sed -i -e '/^#!\//, 1d' Lib/fontTools/mtiLib/__init__.py -cp %{S:1} Tests/cu2qu/data/curves.json +cp %{SOURCE1} Tests/cu2qu/data/curves.json %build %python_build @@ -86,6 +87,10 @@ cp %{S:1} Tests/cu2qu/data/curves.json %install %if "%{flavor}" != "test" %python_install +%python_clone -a %{buildroot}%{_mandir}/man1/ttx.1 +%python_clone -a %{buildroot}%{_bindir}/ttx +%python_clone -a %{buildroot}%{_bindir}/pyftsubset +%python_clone -a %{buildroot}%{_bindir}/pyftmerge %python_expand %fdupes %{buildroot}%{$python_sitelib} # remove undocumented and non working script rm %{buildroot}%{_bindir}/fonttools @@ -109,15 +114,24 @@ export PYTHONDONTWRITEBYTECODE=1 %pytest %else +%post +%python_install_alternative ttx ttx.1 +%python_install_alternative pyftsubset +%python_install_alternative pyftmerge + +%postun +%python_uninstall_alternative ttx +%python_uninstall_alternative pyftsubset +%python_uninstall_alternative pyftmerge %files %{python_files} %license LICENSE LICENSE.external %doc README.rst NEWS.rst %{python_sitelib}/* -%python3_only %{_bindir}/pyftmerge -%python3_only %{_bindir}/pyftsubset -%python3_only %{_bindir}/ttx -%python3_only %{_mandir}/man1/ttx.1%{?ext_man} +%python_alternative %{_bindir}/pyftmerge +%python_alternative %{_bindir}/pyftsubset +%python_alternative %{_bindir}/ttx +%python_alternative %{_mandir}/man1/ttx.1%{?ext_man} %endif