diff --git a/sources b/sources index b16a04f..47bd6db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86f00393eaaab176dca32c2337cdbb33 flip_sticks-13.xo +SHA512 (FlipSticks-14.tar.bz2) = 14861d3aebb5c3a2f11787c5679cb56f9ff9cb47c099f2ba9f2baf60acb0dd73ab3bda08893944a08bc4accf980207468592219410fbe8c3667215ea1c43da18 diff --git a/sugar-flipsticks.spec b/sugar-flipsticks.spec index acc7670..550ee04 100644 --- a/sugar-flipsticks.spec +++ b/sugar-flipsticks.spec @@ -1,21 +1,21 @@ -# 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-flipsticks +<<<<<<< HEAD Version: 13 Release: 18%{?dist} +======= +Version: 14 +Release: 1%{?dist} +>>>>>>> f01bd7f... Update to version 14 Summary: A keyframe animation activity for Sugar License: GPLv2+ URL: http://wiki.sugarlabs.org/go/Activities/Flip_Sticks -Source0: http://download.sugarlabs.org/activities/4044/flip_sticks-%{version}.xo +Source0: http://download.sugarlabs.org/sources/honey/FlipSticks/FlipSticks-%{version}.tar.bz2 BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: sugar-toolkit +BuildRequires: python3-devel +BuildRequires: sugar-toolkit-gtk3 >= 0.116 BuildRequires: gettext -Requires: sugar -Requires: sugar-toolkit +Requires: sugar >= 0.116 %description Flipsticks is a keyframe animation activity that lets you pose and program @@ -26,15 +26,18 @@ programming and animation; it helps develop spatial and analytical thinking skills. %prep -%setup -q -n FlipSticks.activity - -sed -i 's/python/python2/' setup.py +%autosetup -n FlipSticks-%{version} %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}/FlipSticks.activity/ + %find_lang org.worldwideworkshop.olpc.FlipSticks %files -f org.worldwideworkshop.olpc.FlipSticks.lang @@ -43,6 +46,10 @@ python2 ./setup.py install --prefix=%{buildroot}/%{_prefix} %{sugaractivitydir}/FlipSticks.activity/ %changelog +* Fri Feb 19 2021 Ibiam Chihurumnaya - 14-1 +- Update to version 14 +- fix py byte compile + * Wed Jan 27 2021 Fedora Release Engineering - 13-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild