new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4405 ec354946-7b23-47d6-9f5a-488ba84defc7

s/sakura/sakura-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 2.4.0
+%define pkg_version 2.4.1
 %define pkg_release 1%{?_dist_release}
 
 Summary: A terminal emulator based on libvte.
@@ -63,6 +63,9 @@ Sakura は GTK+ 及び VTEベースの端末エミュレータです。依存性
 
 
 %changelog
+* Sun Jul 24 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.1-1
+- new upstream release
+
 * Fri Feb 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.0-1
 - new upstream release
 

t/tuxtype2/tuxtype2-vl.spec

@@ -1,5 +1,5 @@
 %define name	tuxtype2
-%define version	1.5.3
+%define version	1.8.1
 %define release	1%{?_dist_release}
 
 Summary:	An educational typing tutor for children
@@ -8,9 +8,10 @@ Summary(ja):	子供向けのタイピング練習ゲーム
 Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
-Source0:	%{name}-%{version}.tar.bz2
+Source0:	tuxtype_w_fonts-%{version}.tar.gz
 Source1:	tuxtype2.desktop
-License:	GPL
+Patch0:         tuxtype2-1.8.1-chown.patch
+License:	GPLv2+
 Group:		Applications/Games
 URL:		http://tuxtype.sourceforge.net/
 
@@ -18,9 +19,14 @@ Requires:	SDL >= 1.2.5, SDL_image >= 1.2.3
 Requires:	SDL_mixer >= 1.2.5, SDL_ttf >= 2.0.5
 BuildRequires:	SDL-devel >= 1.2.5, SDL_image-devel >= 1.2.3
 BuildRequires:	SDL_mixer-devel >= 1.2.5, SDL_ttf-devel >= 2.0.5
+BuildRequires:	SDL_Pango-devel
+BuildRequires:	librsvg2-devel
+BuildRequires:	ImageMagick
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
+Conflicts:	tuxtype < 1.0.2
+
 
 %description
 "Tux Typing" is an educational typing tutor for children. It features
@@ -32,39 +38,61 @@ Tux Typing は，子供向けのタイピング練習ゲームです。数種類
 
 
 %prep
-
+%setup -q -n tuxtype_w_fonts-%{version}
-%setup
+%patch0 -p1 -b .chown
-
+
+rm -rf data/fonts/*.ttf
+# fix wrong end of line encoding
+sed -i -e 's|\r||g' doc/en/TuxType_port_Mac.txt
+#unknow lang
+pushd po
+mv zh_N.gmo zh_CN.gmo
+mv zh_N.po zh_CN.po
+popd
 
 %build
-%configure
+%configure --localstatedir=%{_localstatedir}/games 
-%__make
+make %{?_smp_mflags}
 
 
 %install
-%__rm -rf ${RPM_BUILD_ROOT}
+rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
 # install menu entry.
-%__install -d %{buildroot}%{_datadir}/applications
+install -d $RPM_BUILD_ROOT%{_datadir}/applications
-%__install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/applications/
+install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/applications/
 
-# remove duplicated documents.
+install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-%__rm -rf ${RPM_BUILD_ROOT}/usr/doc/tuxtype2
+convert -size 48x48 tuxtype.ico $RPM_BUILD_ROOT%{_datadir}/pixmaps/tuxtype.png
+
+install -d $RPM_BUILD_ROOT%{_localstatedir}/games/tuxtype
+
+%find_lang tuxtype
 
 %clean
-%__rm -rf ${RPM_BUILD_ROOT}
+rm -rf ${RPM_BUILD_ROOT}
 
 
-%files
+%files -f tuxtype.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO
+%doc AUTHORS COPYING ChangeLog README TODO doc/en/howtotheme.html doc/en/TuxType_port_Mac.txt
-%doc tuxtype/docs/en/howtotheme.html tuxtype.lsm
+%attr(-,root,games) %{_bindir}/tuxtype
-%{_bindir}/tuxtype2
+%{_datadir}/pixmaps/*
-%{_datadir}/tuxtype2
+%{_datadir}/applications/*
-%{_datadir}/applications/tuxtype2.desktop
+%{_datadir}/tuxtype
+%config(noreplace) %{_sysconfdir}/tuxtype
+%attr(0755,root,games) %config(noreplace) %{_localstatedir}/games/tuxtype
+
 
 %changelog
+* Sun Jul 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.1-1
+- update to 1.8.1
+- add BuildRequires: SDL_Pango-devel, librsvg2-devel, ImageMagick
+- merge spec file from fedora packages
+
 * Sun Oct 12 2008 Shu KONNO <owa@bg.wakwak.com> 1.5.3-1vl5
 - applied new versioning policy, spec in utf-8