diff --git a/wesnoth-1.3.16-remove-ogg-test.patch b/wesnoth-1.3.16-remove-ogg-test.patch index 55792bf..2d69cd9 100644 --- a/wesnoth-1.3.16-remove-ogg-test.patch +++ b/wesnoth-1.3.16-remove-ogg-test.patch @@ -1,20 +1,26 @@ ---- 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 +--- configure.ac 2008-02-22 14:10:36.000000000 -0600 ++++ configure.ac 2008-02-22 14:10:36.000000000 -0600 +@@ -890,23 +890,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("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])]) +- 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])]) - + + CPPFLAGS=$OLD_CPPFLAGS + CFLAGS=$OLD_CFLAGS 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 c54757a..aaf2258 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.5.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme Group: Amusements/Games @@ -10,7 +10,7 @@ Source0: http://www.%{name}.org/files/%{name}-%{version}.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} @@ -244,6 +244,9 @@ fi #%endif %changelog +* 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. @@ -256,7 +259,7 @@ fi * Mon Feb 02 2009 Jon Ciesla - 1.5.8-1 - Update to dev version 1.5.8. -- Redifed remove-ogg-test patch. +- Rediffed remove-ogg-test patch. * Sun Dec 28 2008 Warren Togami - 1.4.7-1 - 1.4.7