[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/gcompris/devel gcompris-8.3.1-fullscreen.patch, NONE, 1.1 gcompris-8.3.1-lib64.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gcompris.spec, 1.20, 1.21 sources, 1.6, 1.7 gcompris-8.2.2-py25.patch, 1.2, NONE



Author: jwrdegoede

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

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-8.3.1-fullscreen.patch gcompris-8.3.1-lib64.patch 
Removed Files:
	gcompris-8.2.2-py25.patch 
Log Message:
* Sat May 26 2007 Hans de Goede <j w r degoede hhs nl> 8.3.1-1
- New upstream release 8.3.1
- Upstream no longer has parts of its code in a library, so the drop the
  -libs and -devel subpackages


gcompris-8.3.1-fullscreen.patch:

--- NEW FILE gcompris-8.3.1-fullscreen.patch ---
diff -ur gcompris-8.3.1/src/gcompris/board_config.c gcompris-8.3.1.new/src/gcompris/board_config.c
--- gcompris-8.3.1/src/gcompris/board_config.c	2007-04-15 19:49:36.000000000 +0200
+++ gcompris-8.3.1.new/src/gcompris/board_config.c	2007-05-26 22:28:04.000000000 +0200
@@ -165,6 +165,7 @@
   /* Creating a config window will cause our main window to loose focus,
      this tells the main window to ignore the next focus out event (and thus
      stay in fullscreen mode if we're fullscreen). */
+  gc_ignore_next_focus_out();
 
   /* main configuration window */
   conf_window = \
diff -ur gcompris-8.3.1/src/gcompris/gcompris.c gcompris-8.3.1.new/src/gcompris/gcompris.c
--- gcompris-8.3.1/src/gcompris/gcompris.c	2007-05-26 22:51:37.000000000 +0200
+++ gcompris-8.3.1.new/src/gcompris/gcompris.c	2007-05-26 22:44:25.000000000 +0200
@@ -65,7 +65,6 @@
 
 //static gint pause_board_cb (GtkWidget *widget, gpointer data);
 static void quit_cb (GtkWidget *widget, gpointer data);
-static void map_cb  (GtkWidget *widget, gpointer data);
 static gint board_widget_key_press_callback (GtkWidget   *widget,
 					    GdkEventKey *event,
 					    gpointer     client_data);
@@ -89,7 +88,6 @@
 
 static GcomprisProperties *properties = NULL;
 static gboolean		   antialiased = FALSE;
-static gboolean		   is_mapped = FALSE;
 
 /****************************************************************************/
 /* Some constants.  */
@@ -243,7 +241,8 @@
   int window_x;
   int window_y;
   gboolean fullscreen_active;
-} XF86VidModeData = { { 0 }, { 0 }, 0, 0, 0, 0, FALSE };
+  int ignore_focus_out;
+} XF86VidModeData = { { 0 }, { 0 }, 0, 0, 0, 0, FALSE, 0 };
 
 static void xf86_vidmode_init( void );
 static void xf86_vidmode_set_fullscreen( int state );
@@ -390,6 +389,13 @@
   return window;
 }
 
+void gc_ignore_next_focus_out()
+{
+#ifdef XF86_VIDMODE
+  XF86VidModeData.ignore_focus_out++;
+#endif
+}
+
 GnomeCanvasItem *gc_set_background(GnomeCanvasGroup *parent, gchar *file)
 {
   GdkPixbuf *background_pixmap = NULL;
@@ -651,9 +657,6 @@
   gtk_signal_connect (GTK_OBJECT (window), "delete_event",
 		      GTK_SIGNAL_FUNC (quit_cb), NULL);
 
-  gtk_signal_connect (GTK_OBJECT (window), "map_event",
-		      GTK_SIGNAL_FUNC (map_cb), NULL);
-
 #ifdef XF86_VIDMODE
   /* The Xf86VidMode code needs to accuratly now the window position,
      this is the only way to get it, and it needs to track the focus to
@@ -971,11 +974,9 @@
   else
     {
       /* The hide must be done at least for KDE */
-      if (is_mapped)
-        gtk_widget_hide (window);
+      gtk_widget_hide (window);
       gdk_window_set_decorations (window->window, GDK_DECOR_ALL);
-      if (is_mapped)
-        gtk_widget_show (window);
+      gtk_widget_show (window);
       gdk_window_set_functions (window->window, GDK_FUNC_ALL);
 #ifdef XF86_VIDMODE
       if(properties->noxf86vm)
@@ -1030,7 +1031,9 @@
 
   gc_board_stop();
   gc_db_exit();
-  gc_fullscreen_set(FALSE);
+#ifdef XF86_VIDMODE
+  xf86_vidmode_set_fullscreen(FALSE);
+#endif
   gc_menu_destroy();
   gc_prop_destroy(gc_prop_get());
   g_unlink(lock_file);
@@ -1058,20 +1061,6 @@
 }
 
 /*
- * We want GCompris to be set as fullscreen the later possible
- *
- */
-static void map_cb (GtkWidget *widget, gpointer data)
-{
-  if(is_mapped == FALSE)
-    {
-      gc_fullscreen_set(properties->fullscreen);
-      is_mapped = TRUE;
-    }
-  g_warning("gcompris window is now mapped");
-}
-
-/*
  * Process the cleanup of the child (no zombies)
  * ---------------------------------------------
  */
@@ -1390,9 +1379,11 @@
 static gint xf86_focus_changed(GtkWindow *window,
   GdkEventFocus *event, gpointer param)
 {
-  if(properties->fullscreen)
-    gdk_pointer_grab(event->window, TRUE, 0, event->window, NULL,
-		     GDK_CURRENT_TIME);
+  /* printf("focus %s\n", (event->in)? "in":"out"); */
+  if (!event->in && XF86VidModeData.ignore_focus_out)
+    XF86VidModeData.ignore_focus_out--;
+  else if (properties->fullscreen)
+    xf86_vidmode_set_fullscreen(event->in);
   /* Act as if we aren't there / aren't hooked up */
   return FALSE;
 }
@@ -1847,6 +1838,9 @@
 
   setup_window ();
 
+  if (properties->fullscreen)
+    gc_fullscreen_set(properties->fullscreen);
+  
   gtk_widget_show_all (window);
 
   /* If a specific activity is selected, skeep the intro music */
diff -ur gcompris-8.3.1/src/gcompris/gcompris.h gcompris-8.3.1.new/src/gcompris/gcompris.h
--- gcompris-8.3.1/src/gcompris/gcompris.h	2007-02-21 00:25:55.000000000 +0100
+++ gcompris-8.3.1.new/src/gcompris/gcompris.h	2007-05-26 22:27:26.000000000 +0200
@@ -116,6 +116,7 @@
 /* General */
 GnomeCanvas     *gc_get_canvas(void);
 GtkWidget	*gc_get_window(void);
+void		gc_ignore_next_focus_out(void);
 
 const gchar	*gc_locale_get(void);
 void		 gc_locale_set(gchar *locale);

gcompris-8.3.1-lib64.patch:

--- NEW FILE gcompris-8.3.1-lib64.patch ---
--- gcompris-8.3.1/src/gcompris/binreloc.c~	2007-05-26 15:05:29.000000000 +0200
+++ gcompris-8.3.1/src/gcompris/binreloc.c	2007-05-26 15:05:29.000000000 +0200
@@ -621,7 +621,10 @@
 			return NULL;
 	}
 
-	dir = g_build_filename (prefix, "lib", NULL);
+	if (default_lib_dir && strstr(default_lib_dir, "lib64"))
+		dir = g_build_filename (prefix, "lib64", NULL);
+	else
+		dir = g_build_filename (prefix, "lib", NULL);
 	g_free (prefix);
 	return dir;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Dec 2006 15:59:20 -0000	1.6
+++ .cvsignore	26 May 2007 21:03:25 -0000	1.7
@@ -1 +1 @@
-gcompris-8.2.2-2.tar.gz
+gcompris-8.3.1.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gcompris.spec	22 Dec 2006 09:25:05 -0000	1.20
+++ gcompris.spec	26 May 2007 21:03:25 -0000	1.21
@@ -1,14 +1,14 @@
-%define extra_version 2
 Name:           gcompris
-Version:        8.2.2
-Release:        2%{?dist}
+Version:        8.3.1
+Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gcompris.net
-Source0:        http://download.sf.net/%{name}/%{name}-%{version}-%{extra_version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         gcompris-8.1-icon.patch
-Patch1:         gcompris-8.2.2-py25.patch
+Patch1:         gcompris-8.3.1-lib64.patch
+Patch2:         gcompris-8.3.1-fullscreen.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
@@ -16,9 +16,11 @@
 Buildrequires:  texinfo perl(XML::Parser) gettext desktop-file-utils gnuchess
 Requires:       gnuchess gnucap tuxpaint gcompris-flags hicolor-icon-theme
 Requires:       pygtk2 python-sqlite2
-Requires:       %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+# note we do not provide these, they no longer exist
+Obsoletes:      %{name}-libs < %{version}-%{release}
+Obsoletes:      %{name}-devel < %{version}-%{release}
 
 %description
 GCompris / I Got IT is an educationnal game for children starting at 2.
@@ -55,23 +57,12 @@
 * ...
 
 
-%package libs
-Summary:        GCompris core-engine library
-Group:          System Environment/Libraries
-
-%description libs
-This package contains the shared library which contains the core-engine of
-GCompris.
-
-
-%package devel
-Summary:        Development libraries and headers for gcompris-lib
-Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
-Requires:       libgnomecanvas-devel pkgconfig
+%package sound-ar
+Summary:        GCompris voices in Arabic (Tunisia)
+Group:          Amusements/Games
 
-%description devel
-Developmental files for the core-engine library of GCompris
+%description sound-ar
+Voice samples for the GCompris games in Arabic (Tunisia).
 
 
 %package sound-cs
@@ -114,6 +105,14 @@
 Voice samples for the GCompris games in Spanish.
 
 
+%package sound-eu
+Summary:        GCompris voices in Basque
+Group:          Amusements/Games
+
+%description sound-eu
+Voice samples for the GCompris games in Basque.
+
+
 %package sound-fi
 Summary:        GCompris voices in Finish
 Group:          Amusements/Games
@@ -130,6 +129,14 @@
 Voice samples for the GCompris games in French.
 
 
+%package sound-hi
+Summary:        GCompris voices in Hindi
+Group:          Amusements/Games
+
+%description sound-hi
+Voice samples for the GCompris games in Hindi.
+
+
 %package sound-hu
 Summary:        GCompris voices in Hungarian
 Group:          Amusements/Games
@@ -138,6 +145,14 @@
 Voice samples for the GCompris games in Hungarian.
 
 
+%package sound-id
+Summary:        GCompris voices in Indonesian
+Group:          Amusements/Games
+
+%description sound-id
+Voice samples for the GCompris games in Indonesian.
+
+
 %package sound-it
 Summary:        GCompris voices in Italian
 Group:          Amusements/Games
@@ -154,6 +169,14 @@
 Voice samples for the GCompris games in Indian Marathi.
 
 
+%package sound-nb
+Summary:        GCompris voices in Norwegian
+Group:          Amusements/Games
+
+%description sound-nb
+Voice samples for the GCompris games in Norwegian.
+
+
 %package sound-nl
 Summary:        GCompris voices in Dutch
 Group:          Amusements/Games
@@ -202,14 +225,6 @@
 Voice samples for the GCompris games in Turk.
 
 
-%package sound-eu
-Summary:        GCompris voices in Basque
-Group:          Amusements/Games
-
-%description sound-eu
-Voice samples for the GCompris games in Basque.
-
-
 %package flags
 Summary:        Country flags for use with GCompris (60x40 PNG)
 Group:          Amusements/Games
@@ -221,7 +236,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1 -z .py25
+%patch1 -p1
+%patch2 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
 mv tmp docs/C/gcompris.info
 
@@ -232,19 +248,21 @@
 %configure --enable-py-build-only --enable-gnet
 # we can't use %%{?_smp_mflags} because that breaks compilation!
 make 
-# Fixup the desktop files a bit, we don't use a patch because that breaks
-# the translations
-sed -i 's/Name=Educational suite gcompris/Name=GCompris Educational suite/' \
+# Fixup the desktop files a bit, we don't use a patch in %%prep because that
+# breaks the translations
+sed -i \
+  -e 's/Name=Educational suite GCompris/Name=GCompris Educational suite/' \
+  -e 's/Categories=Game;KidsGame;/Categories=Education;/' \
   gcompris.desktop
 sed -i \
-  's/Comment=Administration for gcompris/GenericName=Administration for gcompris\nComment=Specify which activities may be used by whom/' \
+  -e 's/Comment=Administration for gcompris/Comment=Specify which activities may be used by whom/' \
+  -e 's/Categories=Education;Teaching;/Categories=Education;/' \
   gcompris-edit.desktop
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libgcompris-1.la
 rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -fr $RPM_BUILD_ROOT/usr/lib/menu
@@ -274,24 +292,16 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -323,7 +333,7 @@
 %{_datadir}/gcompris/boards/scales
 %{_datadir}/gcompris/boards/skins
 %dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/*.ogg
+%{_datadir}/gcompris/boards/sounds/*.wav
 %{_datadir}/gcompris/boards/sounds/melody
 %{_datadir}/gcompris/boards/sounds/memory
 %{_datadir}/gcompris/boards/sounds/chronos
@@ -340,15 +350,12 @@
 %{_infodir}/%{name}.info.gz
 %{_mandir}/man6/%{name}.6.gz
 
-%files libs
+%files sound-ar
 %defattr(-,root,root,-)
-%{_libdir}/libgcompris-1.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/libgcompris-1.0
-%{_libdir}/libgcompris-1.so
-%{_libdir}/pkgconfig/libgcompris-1.0.pc
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/ar
 
 %files sound-cs
 %defattr(-,root,root,-)
@@ -385,6 +392,13 @@
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/es
 
+%files sound-eu
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/eu
+
 %files sound-fi
 %defattr(-,root,root,-)
 %dir %{_datadir}/gcompris
@@ -399,6 +413,13 @@
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/fr
 
+%files sound-hi
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/hi
+
 %files sound-hu
 %defattr(-,root,root,-)
 %dir %{_datadir}/gcompris
@@ -406,6 +427,13 @@
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/hu
 
+%files sound-id
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/id
+
 %files sound-it
 %defattr(-,root,root,-)
 %dir %{_datadir}/gcompris
@@ -420,6 +448,13 @@
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/mr
 
+%files sound-nb
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/nb
+
 %files sound-nl
 %defattr(-,root,root,-)
 %dir %{_datadir}/gcompris
@@ -463,13 +498,6 @@
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/tr
 
-%files sound-eu
-%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/eu
-
 %files flags
 %defattr(-,root,root,-)
 %dir %{_datadir}/gcompris
@@ -478,6 +506,11 @@
 
 
 %changelog
+* Sat May 26 2007 Hans de Goede <j w r degoede hhs nl> 8.3.1-1
+- New upstream release 8.3.1
+- Upstream no longer has parts of its code in a library, so the drop the
+  -libs and -devel subpackages
+
 * Fri Dec 22 2006 Hans de Goede <j w r degoede hhs nl> 8.2.2-2
 - Update src/boards/canvas.c to canvas.c from latest gnome-python2 to
   fix build with python 2.5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Dec 2006 15:59:20 -0000	1.6
+++ sources	26 May 2007 21:03:25 -0000	1.7
@@ -1 +1 @@
-734e17af082d0f4c1b8874037fa73041  gcompris-8.2.2-2.tar.gz
+9a2b8e3ea93153b9e07694dd00d3afb1  gcompris-8.3.1.tar.gz


--- gcompris-8.2.2-py25.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]