rpms/wesnoth/devel wesnoth-1.5.11-remove-ogg-test.patch, NONE, 1.1 wesnoth-1.3.16-remove-ogg-test.patch, 1.2, 1.3 wesnoth.spec, 1.66, 1.67

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32164

Modified Files:
	wesnoth-1.3.16-remove-ogg-test.patch wesnoth.spec 
Added Files:
	wesnoth-1.5.11-remove-ogg-test.patch 
Log Message:
Fix patch naming.


wesnoth-1.5.11-remove-ogg-test.patch:

--- NEW FILE wesnoth-1.5.11-remove-ogg-test.patch ---
--- 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 <SDL_mixer.h>
-    #include <stdlib.h>
-
-    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])])
-

wesnoth-1.3.16-remove-ogg-test.patch:

Index: wesnoth-1.3.16-remove-ogg-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth-1.3.16-remove-ogg-test.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wesnoth-1.3.16-remove-ogg-test.patch	25 Feb 2009 17:04:24 -0000	1.2
+++ wesnoth-1.3.16-remove-ogg-test.patch	25 Feb 2009 17:17:37 -0000	1.3
@@ -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 <SDL_mixer.h>
--    #include <stdlib.h>
+--- 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 <SDL_mixer.h>
+-        #include <stdlib.h>
 -
--    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


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- wesnoth.spec	25 Feb 2009 16:07:54 -0000	1.66
+++ wesnoth.spec	25 Feb 2009 17:17:37 -0000	1.67
@@ -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 @@
 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 @@
 #%endif
 
 %changelog
+* Wed Feb 25 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.11-2
+- Rename rediffed ogg test patch.
+
 * Wed Feb 25 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.11-1
 - Update to dev version 1.5.11.
 
@@ -256,7 +259,7 @@
 
 * Mon Feb 02 2009 Jon Ciesla <limb at jcomserv.net> - 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 <wtogami at redhat.com> - 1.4.7-1
 - 1.4.7