rpms/tuxtype2/F-9 sources,1.3,1.4 tuxtype2.spec,1.10,1.11

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/tuxtype2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6743/F-9

Modified Files:
	sources tuxtype2.spec 
Log Message:
update stable branches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuxtype2/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Feb 2006 20:39:22 -0000	1.3
+++ sources	15 Sep 2008 16:55:26 -0000	1.4
@@ -1 +1 @@
-ca04e65d3b19ddeeedb8a49147ed642b  tuxtype2-1.5.3.tar.bz2
+c2db518f7475e5be5b00a341022883d8  tuxtype_w_fonts-1.5.17.tar.gz


Index: tuxtype2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxtype2/F-9/tuxtype2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tuxtype2.spec	20 Feb 2008 03:12:09 -0000	1.10
+++ tuxtype2.spec	15 Sep 2008 16:55:26 -0000	1.11
@@ -1,15 +1,15 @@
 Name:           tuxtype2
-Version:        1.5.3
-Release:        3%{?dist}
+Version:        1.5.17
+Release:        1%{?dist}
 
 Summary:        Tux Typing, an educational typing tutor for children
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://tuxtype.sourceforge.net/
-Source0:        http://dl.sf.net/tuxtype/%{name}-%{version}.tar.bz2
+Source0:        http://alioth.debian.org/tuxtype_w_fonts-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel
+BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel, SDL_Pango-devel
 BuildRequires:  SDL_ttf-devel, ImageMagick, desktop-file-utils
 BuildRequires:  automake, autoconf
 
@@ -19,12 +19,10 @@
 
 
 %prep
-%setup -q
+%setup -q -n tuxtype_w_fonts-%{version}
 
 
 %build
-aclocal
-autoconf
 %configure
 make %{?_smp_mflags}
 
@@ -32,6 +30,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT/%{_usr}/doc
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
@@ -40,15 +39,15 @@
 [Desktop Entry]
 Name=Tux Typing
 Comment=An educational typing tutor for children.
-Exec=tuxtype2
-Icon=tuxtype.png
+Exec=tuxtype
+Icon=tuxtype
 Terminal=false
 Type=Application
 Encoding=UTF-8
 Categories=Game;Application;
 EOF
 
-convert -size 48x48 tuxtype2.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/tuxtype.png
+convert -size 48x48 tuxtype.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/tuxtype.png
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
 		     --add-category X-Fedora \
 		     --vendor fedora \
@@ -59,13 +58,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO tuxtype/docs/en/howtotheme.html
+%doc AUTHORS COPYING ChangeLog README TODO tuxtype/docs/en/howtotheme.html tuxtype/docs/en/TuxType_port_Mac.txt
 %{_bindir}/*
-%{_datadir}/%{name}
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
+%{_datadir}/tuxtype
 
 %changelog
+* Mon Sep 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.17-1
+- update to 1.5.17 (incorporate Jonathan Dieter's changes)
+
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.3-4
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.5.3-3
 - Autorebuild for GCC 4.3