diff --git a/.gitignore b/.gitignore index 79ca804..ec553cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -typing_turtle-26.xo -/typing_turtle-28.xo -/typing_turtle-29.xo -/typing_turtle-30.xo +/typing_turtle-*.xo +/TypingTurtle-*.tar.bz2 diff --git a/sources b/sources index 6ca8f82..5c5f755 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d41153fbf42a59e6c3ca978e4942b2b typing_turtle-30.xo +0273cdc00aa915896151d7747f428ebf TypingTurtle-30.tar.bz2 diff --git a/sugar-typing-turtle.spec b/sugar-typing-turtle.spec index 7b3abfa..bdd0246 100644 --- a/sugar-typing-turtle.spec +++ b/sugar-typing-turtle.spec @@ -1,17 +1,18 @@ Name: sugar-typing-turtle Version: 30 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A multilingual animated touch typing trainer Group: Sugar/Activities License: GPLv2+ URL: http://wiki.sugarlabs.org/go/Activities/Typing_Turtle -Source0: http://activities.sugarlabs.org/sugar/downloads/file/26483/typing_turtle-%{version}.xo +Source0: http://download.sugarlabs.org/sources/honey/TypingTurtle/TypingTurtle-%{version}.tar.bz2 BuildArch: noarch -BuildRequires: sugar-toolkit +BuildRequires: python-devel +BuildRequires: sugar-toolkit-gtk3 BuildRequires: gettext -Requires: sugar +Requires: sugar >= 0.97.0 %description This Sugar activity features a sequence of lessons designed to gradually @@ -24,7 +25,7 @@ to press each key, encouraging good typing habits. %prep -%setup -q -n TypingTurtle.activity +%setup -q -n TypingTurtle-%{version} # remove unnecessary libs and files rm -rf .pydevproject .project strace.sh @@ -37,8 +38,7 @@ sed -i -e '1d;2i#!/usr/bin/python' typingturtle.py sed -i -e '/^#!\//, 1d' editlessonscreen.py editlessonlistscreen.py %build -python setup.py build - +python ./setup.py build %install python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix} @@ -47,12 +47,14 @@ python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix} %files -f org.laptop.community.TypingTurtle.lang -%defattr(-,root,root,-) %doc port/COPYING-port COPYING NEWS %{sugaractivitydir}/TypingTurtle.activity %changelog +* Fri Sep 28 2012 Peter Robinson - 30-2 +- Update tar file and other updates for gtk3 + * Wed Sep 26 2012 Kalpa Welivitigoda - 30-1 - Release 30