[tuxmath] 2.0.1.

[Jon Ciesla]

commit 7dfefd6162a26d38f482e868362a5a7db35d742b
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Sep 19 12:52:11 2011 -0500

    2.0.1.

 .gitignore                          |    1 +
 sources                             |    2 +-
 tuxmath.spec                        |   21 +++++++++++++--------
 tuxmath_w_fonts-2.0.1-scandir.patch |   11 +++++++++++
 4 files changed, 26 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f763eb..d5024cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 tuxmath_w_fonts-1.8.0.tar.gz
+/tuxmath_w_fonts-2.0.1.tar.gz
diff --git a/sources b/sources
index fa0eb58..5955efc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2432cb31f50f07f60296b3c7b32412e9  tuxmath_w_fonts-1.8.0.tar.gz
+dd9237f9ce38f931ecaae552cdaaaefe  tuxmath_w_fonts-2.0.1.tar.gz
diff --git a/tuxmath.spec b/tuxmath.spec
index 1b9af5a..7cf4247 100644
--- a/tuxmath.spec
+++ b/tuxmath.spec
@@ -1,12 +1,13 @@
 Name:           tuxmath
-Version:        1.8.0
-Release:        2%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Educational math tutor for children
 
 Group:          Amusements/Games
-License:        GPLv3+
+License:        GPLv3+ and CC-BY and OFL
 URL:            http://tux4kids.alioth.debian.org/
 Source0:        https://alioth.debian.org/frs/download.php/3272/%{name}_w_fonts-%{version}.tar.gz
+Patch0:	        tuxmath_w_fonts-2.0.1-scandir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -16,7 +17,7 @@ BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_Pango-devel
 BuildRequires:  SDL_net-devel
 BuildRequires:  librsvg2-devel
-
+BuildRequires:	t4k_common-devel
 
 %description
 TuxMath is an educational math tutor for children. It features several
@@ -27,7 +28,7 @@ different types of gameplay, at a variety of difficulty levels.
 %setup -q -n %{name}_w_fonts-%{version}
 # remove unneeded font files
 rm -f data/fonts/*.ttf
-
+%patch0 -p1
 
 %build
 %configure
@@ -51,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc doc/changelog doc/GPL_VERSIONS doc/COPYING_GPL2 doc/COPYING_GPL3 doc/README_DATA_LICENSES.TXT doc/README.txt doc/TODO.txt
+%doc doc/changelog doc/GPL_VERSIONS doc/COPYING_GPL3 doc/README_DATA_LICENSES doc/README doc/TODO doc/OFL
 %{_bindir}/%{name}*
 %{_bindir}/generate_lesson
 %dir %{_datadir}/%{name}
@@ -60,8 +61,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Mon Jul 18 2011 Jon Ciesla <limb at jcomserv.net> - 2.0.1-1
+- 2.0.1
+- Patch to use system scandir rather than conflicting removed from t4k_common.
+
+* Wed Dec 29 2010 Jon Ciesla <limb at jcomserv.net> - 1.9.0-1
+- 1.9.0
 
 * Sat May 01 2010 Johan Cwiklinski <johan AT x-tnd DOT be> - 1.8.0-1
 - 1.8.0
diff --git a/tuxmath_w_fonts-2.0.1-scandir.patch b/tuxmath_w_fonts-2.0.1-scandir.patch
new file mode 100644
index 0000000..10ab26b
--- /dev/null
+++ b/tuxmath_w_fonts-2.0.1-scandir.patch
@@ -0,0 +1,11 @@
+--- tuxmath_w_fonts-2.0.1/src/globals.h~	2011-04-10 22:05:58.000000000 -0500
++++ tuxmath_w_fonts-2.0.1/src/globals.h	2011-07-18 17:28:38.000000000 -0500
+@@ -55,7 +55,7 @@
+ #include <t4k_alphasort.h>
+ #endif
+ #ifndef HAVE_SCANDIR
+-#include <t4k_scandir.h>
++#include <dirent.h>
+ #endif
+ 
+ /* debug data (now declared in libt4k_common */