rpms/gcompris/F-11 gcompris-9.0-smallnumbers_overlap.patch, NONE, 1.1 gcompris.spec, 1.48, 1.49

[Johan Cwiklinski]

Author: trasher

Update of /cvs/pkgs/rpms/gcompris/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3975

Modified Files:
	gcompris.spec 
Added Files:
	gcompris-9.0-smallnumbers_overlap.patch 
Log Message:
Remove python-sqlite2 requires (bug #480426) - Fix overlaping dice in smallnumber activity

gcompris-9.0-smallnumbers_overlap.patch:
 smallnumbers.c |   25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

--- NEW FILE gcompris-9.0-smallnumbers_overlap.patch ---
diff -up gcompris-9.0/src/smallnumbers-activity/smallnumbers.c.patch gcompris-9.0/src/smallnumbers-activity/smallnumbers.c
--- gcompris-9.0/src/smallnumbers-activity/smallnumbers.c.patch	2010-01-17 00:03:37.000000000 +0100
+++ gcompris-9.0/src/smallnumbers-activity/smallnumbers.c	2010-01-17 00:06:49.000000000 +0100
@@ -328,6 +328,9 @@ smallnumbers_gotkey_item(GooCanvasItem *
 
 static void smallnumbers_move_item(GooCanvasItem *item)
 {
+  if (item == NULL )
+    return;
+
   goo_canvas_item_translate(item, 0, 2.0);
 
   GooCanvasBounds bounds;
@@ -363,7 +366,8 @@ static void smallnumbers_create_item(Goo
   GooCanvasItem *group_item;
   guint i;
   guint total_number = 0;
-  double x;
+  double x = 0;
+  static gdouble x_previous = 0; //remember the position of the first dice
   guint number_of_dice = number_of_dices;
 
   group_item = goo_canvas_group_new (parent, NULL);
@@ -431,8 +435,23 @@ static void smallnumbers_create_item(Goo
 
     g_free(str1);
 
-    x = (double)(g_random_int()%(BOARDWIDTH-
-				 (guint)(rsvg_dimension.width * imageZoom)*2));
+    gdouble item_w = rsvg_dimension.width * imageZoom;
+    if (x == 0)
+      {
+	if ( x_previous < BOARDWIDTH / 2 )
+	  x = x_previous + item_w +
+	    (gdouble)(g_random_int() % (guint)(BOARDWIDTH - x_previous
+					       - item_w * 3));
+
+	else
+	  x = (double)(g_random_int() % (guint)(x_previous - item_w));
+
+	x_previous = x;
+      }
+    else
+      {
+	x += item_w;
+      }
 
     item = goo_canvas_svg_new (group_item, svg_handle, NULL);
     goo_canvas_item_translate(item,


Index: gcompris.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcompris/F-11/gcompris.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- gcompris.spec	8 Jan 2010 19:15:32 -0000	1.48
+++ gcompris.spec	17 Jan 2010 14:02:06 -0000	1.49
@@ -1,6 +1,6 @@
 Name:           gcompris
 Version:        9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
@@ -12,6 +12,8 @@ Patch0:         gcompris-9.0-icon.patch
 Patch1:         gcompris-9.0-photohunter.patch
 #Fix to suits old pycairo versions
 Patch2:         gcompris-9.0-goocanvas.patch
+#Fix for orvelaping dice in smallnumbers activity (https://bugzilla.gnome.org/show_bug.cgi?id=607176)
+Patch3:         gcompris-9.0-smallnumbers_overlap.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
@@ -22,7 +24,7 @@ BuildRequires:  intltool
 #As of 9.0
 BuildRequires:  librsvg2-devel
 Requires:       gnuchess gnucap tuxpaint hicolor-icon-theme
-Requires:       pygtk2 python-sqlite2
+Requires:       pygtk2
 #As of 9.0
 Requires:       gnome-python2-rsvg
 Requires(post): /sbin/install-info
@@ -289,6 +291,7 @@ GCompris development files
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 for file in docs/C/%{name}.info AUTHORS ChangeLog; do
     iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
     touch -r $file $file.new && \
@@ -546,6 +549,10 @@ fi
 
 
 %changelog
+* Sun Jan 17 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 9.0-3
+- Remove python-sqlite2 requires (part of python since 2.5, bug #480426)
+- Fix overlaping dice in smallnumber activity
+
 * Fri Jan 08 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 9.0-2
 - Patch for photohunter in fullscreen (from upstream)
 - Patch to suits older pycairo api