rpms/gcompris/devel gcompris-8.4-configure-bugfix.patch, NONE, 1.1 gcompris-8.4-fullscreen.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 gcompris.spec, 1.27, 1.28 sources, 1.10, 1.11
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Tue Sep 11 21:55:01 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11759
Modified Files:
.cvsignore gcompris.spec sources
Added Files:
gcompris-8.4-configure-bugfix.patch
gcompris-8.4-fullscreen.patch
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-1
- New upstream release 8.4
- Drop -flags sub-package, the idea was that by putting the flags in a
subpackage they could be used by other packages, but this never happened.
- License changed to GPL version 3 (or higher)
gcompris-8.4-configure-bugfix.patch:
--- NEW FILE gcompris-8.4-configure-bugfix.patch ---
diff -up gcompris-8.4/configure~ gcompris-8.4/configure
--- gcompris-8.4/configure~ 2007-09-11 21:13:09.000000000 +0200
+++ gcompris-8.4/configure 2007-09-11 21:13:09.000000000 +0200
@@ -24027,8 +24027,6 @@ _ACEOF
-CFLAGS=$cflags_previous
-LIBS=$libs_previous
# Check whether --enable-glibtest was given.
if test "${enable_glibtest+set}" = set; then
gcompris-8.4-fullscreen.patch:
--- NEW FILE gcompris-8.4-fullscreen.patch ---
diff -up gcompris-8.4/src/gcompris/gcompris.c.fullscreen gcompris-8.4/src/gcompris/gcompris.c
--- gcompris-8.4/src/gcompris/gcompris.c.fullscreen 2007-09-11 22:44:33.000000000 +0200
+++ gcompris-8.4/src/gcompris/gcompris.c 2007-09-11 22:44:58.000000000 +0200
@@ -970,14 +970,27 @@ void gc_fullscreen_set(gboolean state)
{
gdk_window_set_decorations (window->window, 0);
gdk_window_set_functions (window->window, 0);
+ gtk_widget_set_uposition (window, 0, 0);
#ifdef XF86_VIDMODE
- if(properties->noxf86vm)
+ if(!properties->noxf86vm)
+ {
+ gdk_window_set_override_redirect (window->window, 1);
+ gdk_window_set_keep_above (window->window, 1);
+ gdk_window_raise (window->window);
+ }
+ else
#endif
gtk_window_fullscreen (GTK_WINDOW(window));
- gtk_widget_set_uposition (window, 0, 0);
}
else
{
+#ifdef XF86_VIDMODE
+ if(!properties->noxf86vm)
+ {
+ gdk_window_set_keep_above (window->window, 0);
+ gdk_window_set_override_redirect (window->window, 0);
+ }
+#endif
/* The hide must be done at least for KDE */
gtk_widget_hide (window);
gdk_window_set_decorations (window->window, GDK_DECOR_ALL);
@@ -987,7 +1000,6 @@ void gc_fullscreen_set(gboolean state)
if(properties->noxf86vm)
#endif
gtk_window_unfullscreen (GTK_WINDOW(window));
- gtk_widget_set_uposition (window, 0, 0);
/* Mandatory or on windows we get iconified */
gtk_window_deiconify (GTK_WINDOW(window));
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 17 Aug 2007 05:02:48 -0000 1.10
+++ .cvsignore 11 Sep 2007 21:54:28 -0000 1.11
@@ -1 +1 @@
-gcompris-8.3.3.tar.gz
+gcompris-8.4.tar.gz
Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gcompris.spec 17 Aug 2007 05:02:48 -0000 1.27
+++ gcompris.spec 11 Sep 2007 21:54:28 -0000 1.28
@@ -1,25 +1,30 @@
Name: gcompris
-Version: 8.3.3
+Version: 8.4
Release: 1%{?dist}
Summary: Educational suite for kids 2-10 years old
Group: Amusements/Games
-License: GPLv2+
+License: GPLv3+
URL: http://gcompris.net
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-configure-bugfix.patch
+Patch3: gcompris-8.4-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
Buildrequires: gnome-python2 xorg-x11-proto-devel python-sqlite2 texi2html
Buildrequires: texinfo perl(XML::Parser) gettext desktop-file-utils gnuchess
-Requires: gnuchess gnucap tuxpaint gcompris-flags hicolor-icon-theme
+Requires: gnuchess gnucap tuxpaint hicolor-icon-theme
Requires: pygtk2 python-sqlite2
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}
+# the flags are no longer in a separate sub-package
+Obsoletes: %{name}-flags < %{version}-%{release}
+Provides: %{name}-flags = %{version}-%{release}
%description
GCompris / I Got IT is an educationnal game for children starting at 2.
@@ -252,11 +257,14 @@
%setup -q
%patch0 -p1
%patch1 -p1
-iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
-mv tmp docs/C/gcompris.info
+%patch2 -p1
+%patch3 -p1
+iconv -f ISO-8859-1 -t UTF8 docs/C/%{name}.info > tmp
+mv tmp docs/C/%{name}.info
%build
+export CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags pangoft2`"
# The configure check for python-gnome.canvas fails without X running,
# --enable-py-build-only works around this
%configure --enable-py-build-only --enable-gnet
@@ -267,17 +275,17 @@
sed -i \
-e 's/Name=Educational suite GCompris/Name=GCompris Educational suite/' \
-e 's/Categories=Game;KidsGame;/Categories=Education;/' \
- gcompris.desktop
+ %{name}.desktop
sed -i \
-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
+ %{name}-edit.desktop
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -fr $RPM_BUILD_ROOT/usr/lib/menu
%find_lang %{name}
@@ -324,42 +332,8 @@
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_libdir}/%{name}
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%{_datadir}/gcompris/boards/DOCUMENTATIONS
-%{_datadir}/gcompris/boards/README
-%{_datadir}/gcompris/boards/a*
-%{_datadir}/gcompris/boards/b*
-%{_datadir}/gcompris/boards/c*
-%{_datadir}/gcompris/boards/d*
-%{_datadir}/gcompris/boards/e*
-%{_datadir}/gcompris/boards/f*.xml
-%{_datadir}/gcompris/boards/fishes
-%{_datadir}/gcompris/boards/g*
-%{_datadir}/gcompris/boards/h*
-%{_datadir}/gcompris/boards/i*
-%{_datadir}/gcompris/boards/k*
-%{_datadir}/gcompris/boards/l*
-%{_datadir}/gcompris/boards/m*
-%{_datadir}/gcompris/boards/n*
-%{_datadir}/gcompris/boards/o*
-%{_datadir}/gcompris/boards/p*
-%{_datadir}/gcompris/boards/r*
-%{_datadir}/gcompris/boards/s*.xml
-%{_datadir}/gcompris/boards/scales
-%{_datadir}/gcompris/boards/skins
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/*.wav
-%{_datadir}/gcompris/boards/sounds/melody
-%{_datadir}/gcompris/boards/sounds/memory
-%{_datadir}/gcompris/boards/sounds/chronos
-%{_datadir}/gcompris/boards/sounds/LuneRouge
-%{_datadir}/gcompris/boards/sounds/HOWTO_ENCODE
-%{_datadir}/gcompris/boards/sounds/README
-%{_datadir}/gcompris/boards/submarine
-%{_datadir}/gcompris/boards/t*
-%{_datadir}/gcompris/boards/w*
-%{_datadir}/gcompris/python
+%{_datadir}/%{name}
+%exclude %{_datadir}/%{name}/boards/voices
%{_datadir}/gnome
%{_datadir}/icons/hicolor/48x48/apps/%{name}*.png
%{_datadir}/applications/fedora-%{name}*.desktop
@@ -368,174 +342,174 @@
%files sound-ar
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/ar
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/ar
%files sound-cs
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/cs
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/cs
%files sound-da
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/da
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/da
%files sound-de
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/de
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/de
%files sound-el
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/el
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/el
%files sound-en
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/en
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/en
%files sound-es
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/es
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/es
%files sound-eu
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/eu
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/eu
%files sound-fi
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/fi
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/fi
%files sound-fr
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/fr
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/fr
%files sound-hi
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/hi
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/hi
%files sound-hu
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/hu
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/hu
%files sound-id
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/id
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/id
%files sound-it
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/it
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/it
%files sound-mr
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/mr
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/mr
%files sound-nb
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/nb
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/nb
%files sound-nl
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/nl
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/nl
%files sound-pt
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/pt
-%{_datadir}/gcompris/boards/sounds/pt_BR
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/pt
+%{_datadir}/%{name}/boards/voices/pt_BR
%files sound-ru
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/ru
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/ru
%files sound-so
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/so
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/so
%files sound-sr
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/sr
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/sr
%files sound-sv
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/sv
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/sv
%files sound-tr
%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/tr
-
-%files flags
-%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%{_datadir}/gcompris/boards/flags
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/tr
%changelog
+* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-1
+- New upstream release 8.4
+- Drop -flags sub-package, the idea was that by putting the flags in a
+ subpackage they could be used by other packages, but this never happened.
+- License changed to GPL version 3 (or higher)
+
* Thu Aug 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.3.3-1
- New upstream release 8.3.3
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 17 Aug 2007 05:02:48 -0000 1.10
+++ sources 11 Sep 2007 21:54:28 -0000 1.11
@@ -1 +1 @@
-4b551a5ac3c53749927b081c8553d392 gcompris-8.3.3.tar.gz
+33e5882945f43232953478c93eacf0e6 gcompris-8.4.tar.gz
More information about the scm-commits
mailing list