rpms/gcompris/devel gcompris-8.4.5-prefix.patch, NONE, 1.1 gcompris.spec, 1.34, 1.35 gcompris-8.4-configure-bugfix.patch, 1.1, NONE gcompris-8.4-fullscreen.patch, 1.1, NONE gcompris-8.4-fullscreen2.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19680

Modified Files:
	gcompris.spec 
Added Files:
	gcompris-8.4.5-prefix.patch 
Removed Files:
	gcompris-8.4-configure-bugfix.patch 
	gcompris-8.4-fullscreen.patch gcompris-8.4-fullscreen2.patch 
Log Message:
* Thu May 29 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4.5-2
- Fix gcompris not starting anymore (oops) (bz 448642)


gcompris-8.4.5-prefix.patch:

--- NEW FILE gcompris-8.4.5-prefix.patch ---
diff -up gcompris-8.4.5/src/gcompris/gcompris.c~ gcompris-8.4.5/src/gcompris/gcompris.c
--- gcompris-8.4.5/src/gcompris/gcompris.c~	2008-05-29 23:22:33.000000000 +0200
+++ gcompris-8.4.5/src/gcompris/gcompris.c	2008-05-29 23:22:33.000000000 +0200
@@ -1127,7 +1127,7 @@ static void load_properties ()
 #ifdef NSBUNDLE
   exec_prefix = gcompris_nsbundle_resource ();
 #else
-  exec_prefix = gbr_find_exe_dir("");
+  exec_prefix = gbr_find_exe_dir(NULL);
 #endif
   g_warning("exec_prefix %s\n", exec_prefix);
 


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gcompris.spec	15 May 2008 17:27:00 -0000	1.34
+++ gcompris.spec	29 May 2008 21:54:57 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           gcompris
 Version:        8.4.5
-Release:        1%{?dist}
+Release:        2%{?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.5-prefix.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
@@ -256,6 +257,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
+* Thu May 29 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4.5-2
+- Fix gcompris not starting anymore (oops) (bz 448642)
+
 * Thu May 15 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 8.4.5-1
 - New upstream bugfix release 8.4.5
 


--- gcompris-8.4-configure-bugfix.patch DELETED ---


--- gcompris-8.4-fullscreen.patch DELETED ---


--- gcompris-8.4-fullscreen2.patch DELETED ---