rpms/scorchwentbonkers/devel scorchwentbonkers-no-fmod.patch, 1.1, 1.2 scorchwentbonkers.spec, 1.6, 1.7

Hans de Goede jwrdegoede at fedoraproject.org
Mon Feb 22 15:33:08 UTC 2010


Author: jwrdegoede

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

Modified Files:
	scorchwentbonkers-no-fmod.patch scorchwentbonkers.spec 
Log Message:
* Mon Feb 22 2010 Hans de Goede <hdegoede at redhat.com> 1.1-8
- Fix FTBFS (#564908)


scorchwentbonkers-no-fmod.patch:
 Makefile.linux            |    5 -
 src/sound/SoundSystem.cpp |  150 +++++++++++++++++++++++++++++++---------------
 src/sound/SoundSystem.h   |   18 +++--
 3 files changed, 118 insertions(+), 55 deletions(-)

Index: scorchwentbonkers-no-fmod.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scorchwentbonkers/devel/scorchwentbonkers-no-fmod.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scorchwentbonkers-no-fmod.patch	15 Mar 2007 11:26:52 -0000	1.1
+++ scorchwentbonkers-no-fmod.patch	22 Feb 2010 15:33:08 -0000	1.2
@@ -7,7 +7,7 @@ diff -ur scorchwentbonkers.orig/Makefile
  
 -FMOD = -lfmod-3.74
 -LIBS = $(FMOD) -ljpgal -lagl `allegro-config --libs` -lGL -lGLU
-+LIBS = -ljpgal -lagl `allegro-config --libs` `pkg-config --libs AllegroOGG` -lGL -lGLU -ldumb -laldmb
++LIBS = -ljpgal -lagl `allegro-config --libs` `pkg-config --libs AllegroOGG` -lGL -lGLU -ldumb -laldmb -lpthread
  
  CXX = g++
  RM = rm -f


Index: scorchwentbonkers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scorchwentbonkers/devel/scorchwentbonkers.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- scorchwentbonkers.spec	27 Jul 2009 03:59:46 -0000	1.6
+++ scorchwentbonkers.spec	22 Feb 2010 15:33:08 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           scorchwentbonkers
 Version:        1.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Realtime remake of Scorched Earth
 Group:          Amusements/Games
 License:        zlib
@@ -85,6 +85,9 @@ fi
 
 
 %changelog
+* Mon Feb 22 2010 Hans de Goede <hdegoede at redhat.com> 1.1-8
+- Fix FTBFS (#564908)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list