rpms/barrage/F-12 barrage-1.0.2-dsolink.patch, NONE, 1.1 barrage-1.0.2-menu-overflow.patch, NONE, 1.1 barrage.spec, 1.3, 1.4

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/barrage/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5422/F-12

Modified Files:
	barrage.spec 
Added Files:
	barrage-1.0.2-dsolink.patch barrage-1.0.2-menu-overflow.patch 
Log Message:
Crash and build fixes.


barrage-1.0.2-dsolink.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE barrage-1.0.2-dsolink.patch ---
--- configure.in~	2010-03-19 10:14:15.000000000 -0500
+++ configure.in	2010-03-19 10:16:53.808478856 -0500
@@ -16,7 +16,7 @@
 dnl check SDL version                                                           
 AM_PATH_SDL(1.2.0,, AC_MSG_ERROR(lib SDL is needed))                            
 CFLAGS="$CFLAGS $SDL_CFLAGS"                                                    
-LIBS="$LIBS $SDL_LIBS"
+LIBS="$LIBS $SDL_LIBS -lm"
 
 dnl check sound
 audio_flag="-DAUDIO_ENABLED"

barrage-1.0.2-menu-overflow.patch:
 menu.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE barrage-1.0.2-menu-overflow.patch ---
--- src/menu.h~	2005-02-14 12:50:23.000000000 -0600
+++ src/menu.h	2010-03-19 09:50:11.375228533 -0500
@@ -16,7 +16,7 @@
 #define MENU_H
 
 typedef struct {
-	char 	name[20]; 	/* name */
+	char 	name[24]; 	/* name */
 	int  	x, w, h; 	/* size and x position; y depends on the position
 				   in the menu and is computed dynamically */
 	int	id;		/* unique id */


Index: barrage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barrage/F-12/barrage.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- barrage.spec	24 Jul 2009 17:51:19 -0000	1.3
+++ barrage.spec	19 Mar 2010 15:41:08 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           barrage
 Version:        1.0.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Kill and destroy as many targets as possible within 3 minutes
 
 Group:          Amusements/Games
@@ -9,6 +9,8 @@ URL:            http://lgames.sourceforg
 Source0:        http://downloads.sourceforge.net/lgames/%{name}-%{version}.tar.gz
 Source1:        %{name}.png
 Patch0:         newrpms-%{name}-datadir.patch
+Patch1:         barrage-1.0.2-menu-overflow.patch
+Patch2:         barrage-1.0.2-dsolink.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       hicolor-icon-theme
@@ -25,6 +27,8 @@ not that easy to get high scores.
 %prep
 %setup -q
 %patch0 -p0 -b .datadir
+%patch1 -p0
+%patch2 -p0
 # add Icon to desktop file
 echo Icon=barrage >> barrage.desktop
 
@@ -75,6 +79,10 @@ fi
 
 
 %changelog
+* Fri Mar 19 2010 Jon Ciesla <limb at jcomserv.net> - 1.0.2-6
+- Fix for crash due to overflow in menu.
+- Fix for DSOLink error.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild