diff --git a/.gitignore b/.gitignore index aaca9c0..93c9639 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ PlayGo-5.tar.bz2 +/PlayGo-6.tar.bz2 diff --git a/sources b/sources index aebd746..58e4786 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6b257f827a36053babee084d2e22600 PlayGo-5.tar.bz2 +SHA512 (PlayGo-6.tar.bz2) = e086cd9601200a98705344b13ab7408a2a50bcb58b083a1d90260e8fa0af813ff8239174a192b6942f26fc9ee8098649fd469146201938b7788944efa07ea0db diff --git a/sugar-playgo-checkout.sh b/sugar-playgo-checkout.sh deleted file mode 100644 index 934da8e..0000000 --- a/sugar-playgo-checkout.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# This script bsed on a template from the Fedora Project wiki -# https://fedoraproject.org/wiki/Packaging/SugarActivityGuidelines -# -# sugar-playgo-checkout.sh -NAME=PlayGo -REPO_NAME=PlayGo -VERSION=5 -rm -rf $NAME-$VERSION -git clone git://dev.laptop.org/projects/$REPO_NAME $NAME-$VERSION -tar -cjvf $NAME-$VERSION.tar.bz2 $NAME-$VERSION --exclude=.git -rm -rf $NAME-$VERSION diff --git a/sugar-playgo.spec b/sugar-playgo.spec index 1549ab0..84edf62 100644 --- a/sugar-playgo.spec +++ b/sugar-playgo.spec @@ -1,24 +1,19 @@ -# 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-playgo -Version: 5 -Release: 24%{?dist} +Version: 6 +Release: 1%{?dist} Summary: Go for Sugar License: GPLv2+ URL: http://wiki.laptop.org/go/PlayGo Source0: PlayGo-%{version}.tar.bz2 -Source1: %{name}-checkout.sh BuildArch: noarch BuildRequires: gettext -BuildRequires: python2 -BuildRequires: sugar-toolkit +BuildRequires: python3-devel +BuildRequires: sugar-toolkit-gtk3 -Requires: sugar -Requires: sugar-toolkit +Requires: sugar >= 0.116 +Requires: sugar-toolkit-gtk3 %description @@ -31,28 +26,37 @@ rich in strategic complexity despite its simple rules. %prep %setup -q -n PlayGo-%{version} -rm -rf gnugo/gnugo +# Remove binary gnugo +rm -rf bin/ chmod -x infopanel.py -sed -i 's/python/python2/' *.py +sed -i 's/python/python3/' setup.py %build -python2 ./setup.py build +python3 ./setup.py build %install -python2 ./setup.py install --prefix=%{buildroot}/%{_prefix} -%find_lang org.laptop.PlayGo +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}/PlayGo.activity/ + +%find_lang org.laptop.PlayGo %files -f org.laptop.PlayGo.lang -%license gnugo/COPYING -%doc NEWS README +%license COPYING +%doc NEWS README.md %{sugaractivitydir}/PlayGo.activity/ %changelog +* Sat Aug 29 2020 Peter Robinson - 6-1 +- Update to 6 +- Move to python3 + * Sat Aug 01 2020 Fedora Release Engineering - 5-24 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild