rpms/machineball/devel machineball-fixes.patch, 1.2, 1.3 machineball.spec, 1.7, 1.8

Hans de Goede jwrdegoede at fedoraproject.org
Sun Feb 14 10:20:33 UTC 2010


Author: jwrdegoede

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

Modified Files:
	machineball-fixes.patch machineball.spec 
Log Message:
* Sun Feb 14 2010 Hans de Goede <hdegoede at redhat.com> 1.0-9
- Fix FTBFS (#565118)


machineball-fixes.patch:
 machineball-src/Makefile |    8 ++++----
 machineball-src/game.cpp |    9 ++++++---
 machineball-src/timer.h  |   11 +++++++++++
 main.cpp                 |   10 ++++------
 text.cpp                 |    3 +--
 5 files changed, 26 insertions(+), 15 deletions(-)

Index: machineball-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/machineball/devel/machineball-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- machineball-fixes.patch	30 Sep 2008 07:23:38 -0000	1.2
+++ machineball-fixes.patch	14 Feb 2010 10:20:33 -0000	1.3
@@ -1,5 +1,14 @@
 --- machineball-src/Makefile~	2007-04-30 17:24:11.000000000 +0200
 +++ machineball-src/Makefile	2007-04-30 17:24:11.000000000 +0200
+@@ -1,7 +1,7 @@
+ all : machineball
+ 
+ machineball : main.o window.o intro.o menu.o game.o text.o timer.o controls.o ball.o glode.o camera.o render.o court.o machine.o powerup.o explosion.o models.o mbdata.o options.o mbdata.o
+-	gcc main.o window.o intro.o menu.o game.o text.o timer.o controls.o ball.o glode.o camera.o render.o court.o machine.o powerup.o explosion.o models.o mbdata.o options.o -o machineball -laldmb -ldumb -lagl `allegro-config --libs` -lGL -lGLU -lode
++	g++ main.o window.o intro.o menu.o game.o text.o timer.o controls.o ball.o glode.o camera.o render.o court.o machine.o powerup.o explosion.o models.o mbdata.o options.o -o machineball -laldmb -ldumb -lagl `allegro-config --libs` -lGL -lGLU -lode -lm
+ 
+ main.o : main.cpp
+ 
 @@ -39,10 +39,10 @@
  
  options.o : options.cpp


Index: machineball.spec
===================================================================
RCS file: /cvs/pkgs/rpms/machineball/devel/machineball.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- machineball.spec	25 Jul 2009 11:37:56 -0000	1.7
+++ machineball.spec	14 Feb 2010 10:20:33 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           machineball
 Version:        1.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A futuristic ball game with simple rules
 Group:          Amusements/Games
 License:        GPL+
@@ -76,6 +76,9 @@ fi
 
 
 %changelog
+* Sun Feb 14 2010 Hans de Goede <hdegoede at redhat.com> 1.0-9
+- Fix FTBFS (#565118)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list