diff --git a/.gitignore b/.gitignore index 651d5f6..f12980d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /i_know_sri_lanka-*.xo +/IknowSriLanka-*.tar.bz2 diff --git a/sources b/sources index f4e82b1..b6adca3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a210b9d55b0725124e9798ff82d892c4 i_know_sri_lanka-3.xo +SHA512 (IknowSriLanka-4.tar.bz2) = e02abc9717198717fecb74d6d798053498ea4fe7f47c6430170ccb63b5227f71e097723070dbc6c38403417949bd5829e1b7347c58959f30feb5ecb20c39f7bb diff --git a/sugar-srilanka.spec b/sugar-srilanka.spec index 4b612c6..d35bff2 100644 --- a/sugar-srilanka.spec +++ b/sugar-srilanka.spec @@ -1,43 +1,46 @@ -# 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-srilanka -Version: 3 -Release: 14%{?dist} +Version: 4 +Release: 1%{?dist} Summary: Game about the geography of Sri Lanka License: GPLv3+ URL: http://activities.sugarlabs.org//en-US/sugar/addon/4600 -Source0: http://activities.sugarlabs.org/en-US/sugar/downloads/file/28223/i_know_sri_lanka-%{version}.xo +Source0: http://download.sugarlabs.org/sources/honey/IKnowSriLanka/IknowSriLanka-%{version}.tar.bz2 -BuildRequires: python2-devel sugar-toolkit gettext +BuildRequires: gettext +BuildRequires: python3-devel +BuildRequires: sugar-toolkit-gtk3 BuildArch: noarch Requires: sugar -Requires: sugar-toolkit +Requires: sugar-toolkit-gtk3 %description Game about the geography of Sri Lanka. %prep -%setup -q -n IknowSriLanka.activity -sed -i -e '1i#!/usr/bin/python' recursos/comun/datos/commons.py -sed -i 's/python/python2/g' *.py -sed -i 's/python/python2/g' recursos/comun/datos/commons.py +%setup -q -n IknowSriLanka-%{version} +sed -i 's/python/python3/g' *.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}/IknowSriLanka.activity/ %find_lang org.ceibaljam.conozcosrilanka %files -f org.ceibaljam.conozcosrilanka.lang -%doc COPYING README +%license LICENSE.md %{sugaractivitydir}/IknowSriLanka.activity/ %changelog +* Wed Aug 12 2020 Peter Robinson - 4-1 +- Update to 4, migrate to python3 + * Sat Aug 01 2020 Fedora Release Engineering - 3-14 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild