diff --git a/wesnoth-1.2.8-remove-ogg-test.patch b/wesnoth-1.2.8-remove-ogg-test.patch new file mode 100644 index 0000000..7fe4ee6 --- /dev/null +++ b/wesnoth-1.2.8-remove-ogg-test.patch @@ -0,0 +1,27 @@ +diff -ur wesnoth-1.2.8.OLD/configure.ac wesnoth-1.2.8/configure.ac +--- wesnoth-1.2.8.OLD/configure.ac 2007-11-25 06:37:12.000000000 -0500 ++++ wesnoth-1.2.8/configure.ac 2007-11-30 14:21:07.000000000 -0500 +@@ -798,23 +798,6 @@ + LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS" + + ac_link="$LDPREFIX $ac_link" +- AC_RUN_IFELSE([AC_LANG_SOURCE([ +- #include +- #include +- +- int main(int argc, char **argv) +- { +- Mix_Music* music = Mix_LoadMUS("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])]) +- + + CPPFLAGS=$OLD_CPPFLAGS + CFLAGS=$OLD_CFLAGS diff --git a/wesnoth.spec b/wesnoth.spec index fe12c26..3e8f6d6 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme Group: Amusements/Games @@ -9,6 +9,7 @@ URL: http://www.wesnoth.org Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 Source1: wesnothd.init Source2: %{name}.sysconfig +Patch0: %{name}-%{version}-remove-ogg-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel @@ -17,8 +18,12 @@ BuildRequires: SDL_net-devel BuildRequires: freetype-devel BuildRequires: libpng-devel BuildRequires: fribidi-devel +BuildRequires: python-devel BuildRequires: desktop-file-utils BuildRequires: gettext +# Drop these when ogg test patch is removed. +BuildRequires: autoconf +BuildRequires: automake %description @@ -65,6 +70,8 @@ This package contains the game editor and development tools. %prep %setup -q +%patch0 -p1 -b .ogg +autoreconf chmod -x MANUAL* @@ -74,9 +81,9 @@ chmod -x MANUAL* --enable-editor \ --enable-tools \ --enable-server \ + --enable-python \ --with-fifodir=/var/run/wesnothd \ --with-server-uid=$(id -u) \ - --with-server-gid=$(id -g) make %{?_smp_mflags} @@ -160,6 +167,10 @@ fi %ghost /var/run/wesnothd/socket %changelog +* Fri Nov 30 2007 Brian Pepple - 1.2.8-2 +- Add patch to drop ogg test from configure script, until better workaround. +- Enable python support. + * Thu Nov 29 2007 Brian Pepple - 1.2.8-1 - Update to 1.2.8.