Author: lisu Date: Fri Sep 11 14:39:47 2009 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.6.5 - use desktop file provided by creators (it's bigger and better) - estonian translation - editor is now embedded into wesnoth main program - no more manual pages for it
---- Files affected: packages/wesnoth: wesnoth.spec (1.116 -> 1.117) ---- Diffs: ================================================================ Index: packages/wesnoth/wesnoth.spec diff -u packages/wesnoth/wesnoth.spec:1.116 packages/wesnoth/wesnoth.spec:1.117 --- packages/wesnoth/wesnoth.spec:1.116 Sat Aug 29 13:21:42 2009 +++ packages/wesnoth/wesnoth.spec Fri Sep 11 16:39:42 2009 @@ -1,6 +1,5 @@ # $Revision$, $Date$ # TODO -# - use desktop file included with project (consider which one are better) # - unpackaged language files # Conditional build %bcond_without server # without server @@ -11,19 +10,18 @@ Summary(hu.UTF-8): Fantasy környezetben játszódó stratégiai játék Summary(pl.UTF-8): Strategiczna gra z motywem fantasy Name: wesnoth -Version: 1.6.4 -Release: 2 +Version: 1.6.5 +Release: 1 Epoch: 1 License: GPL v2+ Group: X11/Applications/Games/Strategy Source0: http://dl.sourceforge.net/wesnoth/%{name}-%{version}.tar.bz2 -# Source0-md5: c8bc4c5b2be28e29563dfe3f89eafd51 -Source1: %{name}.desktop -Source2: %{name}_editor.desktop -Source3: %{name}d.init +# Source0-md5: 493826bbd9ba355930765a7e8fe3749a +Source1: %{name}d.init Patch0: %{name}-Makefile.patch Patch1: %{name}-locale_dir.patch Patch2: %{name}-werror.patch +Patch3: %{name}-desktop.patch URL: http://www.wesnoth.org/ BuildRequires: SDL-devel >= 1.2.7 BuildRequires: SDL_image-devel >= 1.2 @@ -115,6 +113,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %{__sed} -i 's,$PYTHON_PREFIX"/lib/,"%{_libdir}/,g' configure.ac %build @@ -147,10 +146,8 @@ install changelog README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{changelog,README} -install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir} %if %{with server} -install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/wesnothd +install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/wesnothd %endif mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{nb_NO,nb} @@ -199,6 +196,7 @@ #%%lang(da) %{_mandir}/da/man6/wesnoth.6* %lang(de) %{_mandir}/de/man6/wesnoth.6* %lang(es) %{_mandir}/es/man6/wesnoth.6* +%lang(et) %{_mandir}/et/man6/wesnoth.6* %lang(fi) %{_mandir}/fi/man6/wesnoth.6* %lang(fr) %{_mandir}/fr/man6/wesnoth.6* %lang(gl) %{_mandir}/gl/man6/wesnoth.6* @@ -217,8 +215,8 @@ %lang(zh_CN) %{_mandir}/zh_CN/man6/wesnoth.6* %lang(zh_TW) %{_mandir}/zh_TW/man6/wesnoth.6* %{_datadir}/%{name} -%{_desktopdir}/%{name}.desktop -%{_pixmapsdir}/%{name}-icon.png +%{_desktopdir}/*.desktop +%{_pixmapsdir}/*-icon.png %if %{with server} %files server @@ -231,6 +229,7 @@ #%%lang(da) %{_mandir}/da/man6/wesnothd.6* %lang(de) %{_mandir}/de/man6/wesnothd.6* %lang(es) %{_mandir}/es/man6/wesnothd.6* +%lang(et) %{_mandir}/et/man6/wesnothd.6* %lang(fi) %{_mandir}/fi/man6/wesnothd.6* %lang(fr) %{_mandir}/fr/man6/wesnothd.6* #%%lang(gl) %{_mandir}/gl/man6/wesnothd.6* @@ -256,31 +255,9 @@ %attr(755,root,root) %{_bindir}/cutter %attr(755,root,root) %{_bindir}/exploder %attr(755,root,root) %{_bindir}/wesnoth_addon_manager -#%%attr(755,root,root) %{_bindir}/wesnoth_editor %attr(755,root,root) %{_bindir}/wmlindent %attr(755,root,root) %{_bindir}/wmllint %attr(755,root,root) %{_bindir}/wmlscope -#%%{_mandir}/man6/wesnoth_editor.6* -#%%lang(cs) %{_mandir}/cs/man6/wesnoth_editor.6* -#%%lang(da) %{_mandir}/da/man6/wesnoth_editor.6* -#%%lang(de) %{_mandir}/de/man6/wesnoth_editor.6* -#%%lang(es) %{_mandir}/es/man6/wesnoth_editor.6* -#%%lang(fr) %{_mandir}/fr/man6/wesnoth_editor.6* -#%%lang(gl) %{_mandir}/gl/man6/wesnoth_editor.6* -#%%lang(hu) %{_mandir}/hu/man6/wesnoth_editor.6* -#%%lang(it) %{_mandir}/it/man6/wesnoth_editor.6* -#%%lang(ja) %{_mandir}/ja/man6/wesnoth_editor.6* -#%%lang(lt) %{_mandir}/lt/man6/wesnoth_editor.6* -#%%lang(nl) %{_mandir}/nl/man6/wesnoth_editor.6* -#%%lang(pl) %{_mandir}/pl/man6/wesnoth_editor.6* -#%%lang(sk) %{_mandir}/sk/man6/wesnoth_editor.6* -#%%lang(sr) %{_mandir}/sr/man6/wesnoth_editor.6* -#%%lang(sv) %{_mandir}/sv/man6/wesnoth_editor.6* -#%%lang(tr) %{_mandir}/tr/man6/wesnoth_editor.6* -#%%lang(zh_CN) %{_mandir}/zh_CN/man6/wesnoth_editor.6* -#%%lang(zh_TW) %{_mandir}/zh_TW/man6/wesnoth_editor.6* -%{_desktopdir}/%{name}_editor.desktop -%{_pixmapsdir}/%{name}_editor-icon.png %dir %{py_sitedir}/%{name} %{py_sitedir}/%{name}/*.py[co] %endif @@ -291,6 +268,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.117 2009/09/11 14:39:42 lisu +- up to 1.6.5 +- use desktop file provided by creators (it's bigger and better) +- estonian translation +- editor is now embedded into wesnoth main program - no more manual pages for it + Revision 1.116 2009/08/29 11:21:42 pluto - release 2 (rebuild with boost-1.40.0) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wesnoth/wesnoth.spec?r1=1.116&r2=1.117&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
