diff --git a/sources b/sources index 0719fc6..234a8bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6bac2c870bbea7cb6ee9dab2f35c6948 xoEditor-13.tar.bz2 +SHA512 (xoEditor-14.tar.bz2) = b2f376b9f9a70026725932aadb698536ec5330a0c56000ac99bc6e21f715781377d542614ce0455fcae74e820593bc1c3e00696d005ea7648102108e066c9bda diff --git a/sugar-xoeditor.spec b/sugar-xoeditor.spec index 7cb1fca..1d00b67 100644 --- a/sugar-xoeditor.spec +++ b/sugar-xoeditor.spec @@ -1,17 +1,15 @@ -# This package depends on automagic byte compilation -# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 -%global _python_bytecompile_extra 1 - Name: sugar-xoeditor -Version: 13 -Release: 14%{?dist} +Version: 14 +Release: 1%{?dist} Summary: Editor for XO icon colors License: GPLv3+ and MIT URL: http://wiki.sugarlabs.org/go/Activities/XoEditor Source0: http://download.sugarlabs.org/sources/honey/xoEditor/xoEditor-%{version}.tar.bz2 -BuildRequires: python2-devel sugar-toolkit-gtk3 gettext +BuildRequires: python3-devel +BuildRequires: sugar-toolkit-gtk3 +BuildRequires: gettext BuildArch: noarch Requires: sugar @@ -21,15 +19,18 @@ Editor for XO icon colors; Lets you explore different color patterns. %prep %setup -q -n xoEditor-%{version} -sed -i "s|python|python2|g" setup.py +sed -i "s|python|python3|g" setup.py %build -%{__python2} ./setup.py build +python3 ./setup.py build %install -%{__python2} ./setup.py install --prefix=%{buildroot}/%{_prefix} +python3 ./setup.py install --prefix=%{buildroot}/%{_prefix} rm %{buildroot}%{_prefix}/share/applications/*.desktop || true +# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_3 +%py_byte_compile %{python3} %{buildroot}/%{sugaractivitydir}/xoEditor.activity/ + %find_lang org.laptop.xoEditorActivity @@ -39,6 +40,9 @@ rm %{buildroot}%{_prefix}/share/applications/*.desktop || true %{sugaractivitydir}/xoEditor.activity/ %changelog +* Wed Aug 12 2020 Peter Robinson - 14-1 +- Update to xoEditor 14, migrate to python3 + * Sat Aug 01 2020 Fedora Release Engineering - 13-14 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild