From b0115b095cd3e62583e5fe943ba4b0aa59ff6c9a Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Apr 09 2009 17:41:34 +0000 Subject: Update to 1.6, BZ 494678. --- diff --git a/sources b/sources index b8f1c18..90b54de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fdd341c3d66bf1bea2113c79db852d68 wesnoth-1.4.7.tar.bz2 +3c4618eb64d1e5aeb6a00ab3956d5080 wesnoth-1.6a.tar.bz2 diff --git a/wesnoth-1.5.11-remove-ogg-test.patch b/wesnoth-1.5.11-remove-ogg-test.patch new file mode 100644 index 0000000..55792bf --- /dev/null +++ b/wesnoth-1.5.11-remove-ogg-test.patch @@ -0,0 +1,20 @@ +--- configure.ac~ 2009-02-02 13:31:10.000000000 -0600 ++++ configure.ac 2009-02-02 13:31:10.000000000 -0600 +@@ -877,17 +876,0 @@ +- AC_RUN_IFELSE([AC_LANG_SOURCE([ +- #include +- #include +- +- int main(int argc, char **argv) +- { +- Mix_Music* music = Mix_LoadMUS("data/core/music/main_menu.ogg"); +- if (music == NULL) +- exit(1); +- exit(0); +- } +- ])], +- [AC_MSG_RESULT(yes)], +- [AC_MSG_RESULT(no)] +- [AC_MSG_ERROR([*** SDL_mixer has no OGG support! You need SDL_mixer with OGG support])], +- [AC_MSG_RESULT([not tested in cross-compiling])]) +- diff --git a/wesnoth.spec b/wesnoth.spec index 487ae2d..8ad59cd 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,22 +1,23 @@ Name: wesnoth -Version: 1.4.7 +Version: 1.6 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme Group: Amusements/Games License: GPLv2+ URL: http://www.wesnoth.org -Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 +Source0: http://www.%{name}.org/files/%{name}-%{version}a.tar.bz2 Source1: wesnothd.init Source2: %{name}.sysconfig Patch0: %{name}-1.2.8-gcc43.patch -Patch1: wesnoth-1.3.16-remove-ogg-test.patch +Patch1: wesnoth-1.5.11-remove-ogg-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: wesnoth-data = %{version} BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: SDL_net-devel +BuildRequires: SDL_ttf-devel BuildRequires: freetype-devel BuildRequires: libpng-devel BuildRequires: fribidi-devel @@ -24,6 +25,7 @@ BuildRequires: python-devel BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: boost-devel +BuildRequires: pango-devel # Drop these when ogg test patch is removed. BuildRequires: autoconf BuildRequires: automake @@ -45,7 +47,7 @@ be played out. You can create your own custom units, and write your own scenarios--or even full-blown campaigns. You can also challenge your friends--or strangers--and fight multi-player epic fantasy battles. -%ifnarch noarch +##%ifnarch noarch %package server Summary: %{summary} Group: Amusements/Games @@ -69,18 +71,19 @@ Requires: %{name} = %{version}-%{release} %description tools This package contains the game editor and development tools. -%else +##%else %package data Summary: %{summary} Group: Amusements/Games Requires: %{name} = %{version} +BuildArch: noarch %description data This package contains the data files for Wesnoth. -%endif +##%endif %prep -%setup -q +%setup -qn wesnoth-1.6a %patch0 -p1 -b .gcc43 %patch1 -p0 autoreconf @@ -97,21 +100,23 @@ autoreconf --enable-python \ --with-fifodir=/var/run/wesnothd \ --with-server-uid=$(id -u) \ - --with-server-gid=$(id -g) -%ifnarch noarch + --with-server-gid=$(id -g) \ + --disable-strict-compilation +#%ifnarch noarch make %{?_smp_mflags} -%endif +#%endif %install rm -rf $RPM_BUILD_ROOT -%ifarch noarch +#%ifarch noarch ### Data Files and Desktop Files make install-data DESTDIR=${RPM_BUILD_ROOT} rm -rf $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ --mode="0644" --vendor fedora \ + --remove-key="Version" \ icons/%{name}.desktop # add icon for menus @@ -131,12 +136,13 @@ ln -s /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc $RPM_BUILD_ROOT/%{_datadir}/%{n %find_lang %{name}.\* -%else +#%else ### Binaries and Config Files make install-exec DESTDIR=${RPM_BUILD_ROOT} desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ --mode="0644" --vendor fedora \ + --remove-key="Version" \ icons/%{name}_editor.desktop # arrange server package files @@ -149,7 +155,7 @@ install -Dpm 755 %{SOURCE1} \ install -Dpm 644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth -%endif +#%endif ### Cleanup Stuff rm -f $RPM_BUILD_ROOT/usr/share/applications/wesnoth* @@ -162,12 +168,12 @@ find $RPM_BUILD_ROOT/ -name 'Makefile*' |xargs rm -f rm -rf $RPM_BUILD_ROOT/usr/share/doc/wesnoth/ rm -f $RPM_BUILD_ROOT/usr/share/icons/wesnoth-icon.png rm -f $RPM_BUILD_ROOT/usr/share/icons/wesnoth_editor-icon.png - +rm -f $RPM_BUILD_ROOT/usr/share/applications/fedora-wesnoth_editor.desktop %clean rm -rf $RPM_BUILD_ROOT -%ifarch noarch +#%ifarch noarch %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then @@ -179,9 +185,9 @@ touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi -%endif +#%endif -%ifnarch noarch +#%ifnarch noarch %pre server /usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \ -r -d /var/run/wesnothd wesnothd 2> /dev/null || : @@ -199,9 +205,9 @@ if [ $1 -eq 0 ]; then %{_initrddir}/wesnothd stop >/dev/null 2>&1 || : /sbin/chkconfig --del wesnothd fi -%endif +#%endif -%ifnarch noarch +#%ifnarch noarch %files %doc COPYING changelog README copyright doc/manual/ %defattr(-,root,root,-) @@ -209,13 +215,14 @@ fi %files tools %defattr(-,root,root,-) -%{_bindir}/wesnoth_editor +#%{_bindir}/wesnoth_editor +%{_bindir}/wesnoth_addon_manager %{_bindir}/exploder %{_bindir}/cutter %{_bindir}/wmlindent %{_bindir}/wmllint %{_bindir}/wmlscope -%{_datadir}/applications/fedora-wesnoth_editor.desktop +#%{_datadir}/applications/fedora-wesnoth_editor.desktop %files server %defattr(-,root,root,-) @@ -224,9 +231,9 @@ fi %{_sbindir}/wesnothd %attr(0700,wesnothd,wesnothd) %dir /var/run/wesnothd/ %ghost /var/run/wesnothd/socket -%endif +#%endif -%ifarch noarch +#%ifarch noarch %files data -f %{name}.\*.lang %defattr(-,root,root,-) %{_datadir}/%{name} @@ -234,14 +241,52 @@ fi %{_datadir}/pixmaps/* %{_mandir}/man6/wesnoth.6* %{_mandir}/*/man6/wesnoth.6* -%{_mandir}/man6/wesnoth_editor.6* -%{_mandir}/*/man6/wesnoth_editor.6* +#%{_mandir}/man6/wesnoth_editor.6* +#%{_mandir}/*/man6/wesnoth_editor.6* %{_mandir}/man6/wesnothd.* %{_mandir}/*/man6/wesnothd.* -%endif +#%endif %changelog +* Mon Mar 23 2009 Jon Ciesla - 1.6-1 +- Update to 1.6 stable. + +* Tue Mar 17 2009 Jon Ciesla - 1.5.14-1 +- Update to 1.5.14. + +* Wed Mar 11 2009 Jon Ciesla - 1.5.13-1 +- Update to 1.5.13. + +* Wed Mar 04 2009 Jon Ciesla - 1.5.12-1 +- Update to 1.5.12. + +* Wed Feb 25 2009 Jon Ciesla - 1.5.11-5 +- Drop -Werror. + +* Wed Feb 25 2009 Jon Ciesla - 1.5.11-4 +- Add pango BR. + +* Wed Feb 25 2009 Jon Ciesla - 1.5.11-3 +- Add SDL_ttf BR. + +* Wed Feb 25 2009 Jon Ciesla - 1.5.11-2 +- Rename rediffed ogg test patch. + +* Wed Feb 25 2009 Jon Ciesla - 1.5.11-1 +- Update to dev version 1.5.11. + +* Tue Feb 24 2009 Jon Ciesla - 1.5.10-1 +- Update to dev version 1.5.10. +- Move data to noarch. + +* Wed Feb 04 2009 Jon Ciesla - 1.5.9-1 +- Update to dev version 1.5.9. + +* Mon Feb 02 2009 Jon Ciesla - 1.5.8-1 +- Update to dev version 1.5.8. +- Rediffed remove-ogg-test patch. + * Sun Dec 28 2008 Warren Togami - 1.4.7-1 - 1.4.7 - Remove font requirement