rpms/gweled/FC-6 gweled-mikmod-disable-disk-writers.diff, NONE, 1.1 gweled-ppc.diff, NONE, 1.1 gweled.spec, 1.15, 1.16

[Thorsten Leemhuis (thl)]

Author: thl

Update of /cvs/extras/rpms/gweled/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18388

Modified Files:
	gweled.spec 
Added Files:
	gweled-mikmod-disable-disk-writers.diff gweled-ppc.diff 
Log Message:
0.7-7
- Add gweled-ppc.diff and gweled-mikmod-disable-disk-writers.diff from
  debian package; the later fixes #227984

gweled-mikmod-disable-disk-writers.diff:

--- NEW FILE gweled-mikmod-disable-disk-writers.diff ---
diff -urN gweled-0.7~/src/main.c gweled-0.7/src/main.c
--- gweled-0.7~/src/main.c	2005-05-25 23:44:04.000000000 +0200
+++ gweled-0.7/src/main.c	2006-12-05 18:29:49.000000000 +0100
@@ -254,7 +254,11 @@
 				PACKAGE_DATA_DIR, NULL);
 
     /* register all the drivers */
-    MikMod_RegisterAllDrivers();
+    MikMod_RegisterDriver(&drv_AF);
+    MikMod_RegisterDriver(&drv_esd);
+    MikMod_RegisterDriver(&drv_alsa);
+    MikMod_RegisterDriver(&drv_oss);
+    MikMod_RegisterDriver(&drv_nos);
 
     /* register all the module loaders */
     MikMod_RegisterAllLoaders();

gweled-ppc.diff:

--- NEW FILE gweled-ppc.diff ---
--- src/board_engine.c.orig	2004-11-09 22:53:38.000000000 +0100
+++ src/board_engine.c	2004-11-09 23:12:28.116177720 +0100
@@ -40,7 +40,7 @@
 gint gi_x_click = 0;
 gint gi_y_click = 0;
 
-gchar gpc_game_board[BOARD_WIDTH][BOARD_HEIGHT];
+gint gpc_game_board[BOARD_WIDTH][BOARD_HEIGHT];
 gint gi_nb_of_tiles[7];
 
 gboolean g_do_not_score;


Index: gweled.spec
===================================================================
RCS file: /cvs/extras/rpms/gweled/FC-6/gweled.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gweled.spec	29 Aug 2006 05:40:16 -0000	1.15
+++ gweled.spec	24 Feb 2007 12:45:23 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gweled
 Version:        0.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Swapping gem game
 
@@ -10,6 +10,8 @@
 Source0:        http://sebdelestaing.free.fr/gweled/Release/gweled-%{version}.tar.gz
 Patch0:         %{name}-Makefile.patch
 Patch1:		%{name}-Sample_Free.patch
+Patch2:		%{name}-ppc.diff
+Patch3:		%{name}-mikmod-disable-disk-writers.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.0.0
@@ -28,7 +30,12 @@
 %prep
 %setup -q
 %patch0  -p0 -b .patch0
-%patch1  -p0 -b .patch0
+%patch1  -p0 -b .patch1
+# the next two were extracted from the debian package; I asked upstream to 
+# apply them, but got no reply
+# http://ftp.debian.org/debian/pool/main/g/gweled/gweled_0.7-2.diff.gz
+%patch2  -p0 -b .patch2
+%patch3  -p1 -b .patch3
 
 %build
 export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
@@ -67,6 +74,10 @@
 %{_datadir}/sounds/%{name}/
 
 %changelog
+* Sat Feb 24 2007 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-7
+- Add gweled-ppc.diff and gweled-mikmod-disable-disk-writers.diff from
+  debian package; the later fixes #227984
+
 * Tue Aug 29 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-6
 - Rebuild for devel