rpms/gcompris/devel gcompris-8.4.8-python26-reserved-keyword.patch, NONE, 1.1 gcompris.spec, 1.41, 1.42

[Johan Cwiklinski]

Author: trasher

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24699

Modified Files:
	gcompris.spec 
Added Files:
	gcompris-8.4.8-python26-reserved-keyword.patch 
Log Message:
Fix for python 2.6 reserved keyword


gcompris-8.4.8-python26-reserved-keyword.patch:

--- NEW FILE gcompris-8.4.8-python26-reserved-keyword.patch ---
diff -up gcompris-8.4.8/src/boards/python/admin/class_edit.py.patch gcompris-8.4.8/src/boards/python/admin/class_edit.py
--- gcompris-8.4.8/src/boards/python/admin/class_edit.py.patch	2009-02-27 20:11:11.000000000 +0100
+++ gcompris-8.4.8/src/boards/python/admin/class_edit.py	2009-02-27 20:11:27.000000000 +0100
@@ -223,10 +223,10 @@ class ClassEdit(gtk.Window):
     # If class_id is provided, only users in this class are inserted
     # If with = True, create a list only with the given class_id.
     #           False, create a list only without the given class_id
-    def __create_model(self, with, class_id):
+    def __create_model(self, _with, class_id):
 
         # Grab the user data
-        if(with):
+        if(_with):
             self.cur.execute('SELECT user_id,firstname,lastname FROM users where class_id=? ORDER BY login', (class_id,))
         else:
             self.cur.execute('SELECT user_id,firstname,lastname FROM users WHERE class_id!=? ORDER BY login', (class_id,))
diff -up gcompris-8.4.8/src/boards/python/admin/group_edit.py.patch gcompris-8.4.8/src/boards/python/admin/group_edit.py
--- gcompris-8.4.8/src/boards/python/admin/group_edit.py.patch	2009-02-27 20:11:50.000000000 +0100
+++ gcompris-8.4.8/src/boards/python/admin/group_edit.py	2009-02-27 20:12:13.000000000 +0100
@@ -228,7 +228,7 @@ class GroupEdit(gtk.Window):
     # group_id: only users in this group are inserted
     # If with = True,  create a list only with user in the given class_id and group_id.
     #           False, create a list only with user in the given class_id but NOT this group_id
-    def __create_model(self, with, class_id, group_id):
+    def __create_model(self, _with, class_id, group_id):
 
         model = gtk.ListStore(
             gobject.TYPE_INT,
@@ -247,9 +247,9 @@ class GroupEdit(gtk.Window):
                              (group_id, user[0]))
             user_is_already = self.cur.fetchall()
 
-            if(with and user_is_already):
+            if(_with and user_is_already):
                 self.add_user_in_model(model, user)
-            elif(not with and not user_is_already):
+            elif(not _with and not user_is_already):
                 self.add_user_in_model(model, user)
 
 
diff -up gcompris-8.4.8/src/boards/python/admin/profile_edit.py.patch gcompris-8.4.8/src/boards/python/admin/profile_edit.py
--- gcompris-8.4.8/src/boards/python/admin/profile_edit.py.patch	2009-02-27 20:12:58.000000000 +0100
+++ gcompris-8.4.8/src/boards/python/admin/profile_edit.py	2009-02-27 20:13:20.000000000 +0100
@@ -223,7 +223,7 @@ class ProfileEdit(gtk.Window):
     # profile_id: only groups in this profile are inserted
     # If with = True,  create a list only with groups in the given profile_id
     #           False, create a list only with groups NOT this profile_id
-    def __create_model(self, with, profile_id):
+    def __create_model(self, _with, profile_id):
 
         model = gtk.ListStore(
             gobject.TYPE_INT,
@@ -252,9 +252,9 @@ class ProfileEdit(gtk.Window):
             # Insert the class name in the group
             group = (group[0], class_name, group[1], group[2])
 
-            if(with and group_is_already):
+            if(_with and group_is_already):
                 self.add_group_in_model(model, group)
-            elif(not with and not group_is_already):
+            elif(not _with and not group_is_already):
                 self.add_group_in_model(model, group)
 
         return model


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gcompris.spec	24 Feb 2009 19:51:18 -0000	1.41
+++ gcompris.spec	28 Feb 2009 08:50:22 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           gcompris
 Version:        8.4.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
@@ -8,6 +8,7 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         gcompris-8.1-icon.patch
 Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
+Patch2:         gcompris-8.4.8-python26-reserved-keyword.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
@@ -257,6 +258,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/%{name}.info > tmp
 mv tmp docs/C/%{name}.info
 iconv -f ISO-8859-1 -t UTF8 AUTHORS > tmp
@@ -503,6 +505,9 @@
 
 
 %changelog
+* Fri Feb 27 2009 Johan Cwiklinski <johan AT x-tnd DOT be> - 8.4.8-4
+- Fix python 2.6 reserved keyword
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.4.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild