rpms/gcompris/FC-5 gcompris-8.1-icon.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gcompris.spec, 1.9, 1.10 sources, 1.3, 1.4 U006A.ogg, 1.1, NONE gcompris-7.4-xf86vidmode.patch, 1.4, NONE gcompris-7.4-xf86vidmode2.patch, 1.1, NONE gcompris-7.4-xf86vidmode3.patch, 1.1, NONE gcompris-click_on_letter.patch, 1.1, NONE gcompris-electric.patch, 1.1, NONE gcompris-nl.patch, 1.1, NONE gcompris-sys-assetml.patch, 1.1, NONE gcompris.6, 1.1, NONE

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Tue Nov 7 19:17:11 UTC 2006 

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31145

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-8.1-icon.patch 
Removed Files:
	U006A.ogg gcompris-7.4-xf86vidmode.patch 
	gcompris-7.4-xf86vidmode2.patch 
	gcompris-7.4-xf86vidmode3.patch gcompris-click_on_letter.patch 
	gcompris-electric.patch gcompris-nl.patch 
	gcompris-sys-assetml.patch gcompris.6 
Log Message:
* Tue Nov  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.2-1
- New upstream release 8.2
- Drop most patches (integrated upstream)
- Drop seperate / addon man page (integrated upstream)


gcompris-8.1-icon.patch:

--- NEW FILE gcompris-8.1-icon.patch ---
--- gcompris-8.1/src/gcompris/gcompris.c~	2006-10-15 14:44:14.000000000 +0200
+++ gcompris-8.1/src/gcompris/gcompris.c	2006-10-15 14:44:14.000000000 +0200
@@ -625,7 +625,7 @@
    * Set an icon for gcompris
    * ------------------------
    */
-  icon_file = g_strconcat(properties->system_icon_dir, "/gcompris.png", NULL);
+  icon_file = g_strconcat("/usr/share/icons/hicolor/48x48/apps", "/gcompris.png", NULL);
   if (!g_file_test (icon_file, G_FILE_TEST_EXISTS)) {
       /* Now check if this file is on the net */
       icon_file = gc_net_get_url_from_file("gcompris.png", NULL);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Aug 2006 10:35:38 -0000	1.3
+++ .cvsignore	7 Nov 2006 19:16:40 -0000	1.4
@@ -1,2 +1 @@
-gcompris-7.4.tar.gz
-gcompris-africa-patch.tar.gz
+gcompris-8.2.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gcompris.spec	13 Aug 2006 10:35:38 -0000	1.9
+++ gcompris.spec	7 Nov 2006 19:16:40 -0000	1.10
@@ -1,29 +1,19 @@
 Name:           gcompris
-Version:        7.4
-Release:        13%{?dist}
+Version:        8.2
+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}.tar.gz
-Source1:        gcompris.6
-Source2:        U006A.ogg
-Source3:        gcompris-africa-patch.tar.gz
-Patch1:         gcompris-sys-assetml.patch
-Patch2:         gcompris-nl.patch
-Patch3:         gcompris-electric.patch
-Patch4:         gcompris-click_on_letter.patch
-Patch5:         gcompris-7.4-xf86vidmode.patch
-Patch6:         gcompris-7.4-xf86vidmode2.patch
-Patch7:         gcompris-7.4-xf86vidmode3.patch
+Patch0:         gcompris-8.1-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildrequires:  libgnomeui-devel sqlite-devel libassetml-devel python-devel
+Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
-Buildrequires:  xorg-x11-proto-devel
-Buildrequires:  gnome-python2-canvas python-sqlite2 texinfo texi2html
-Buildrequires:  perl(XML::Parser) gettext desktop-file-utils gnuchess
-Requires:       gnuchess gnucap tuxpaint gcompris-flags
-Requires:       gnome-python2-canvas python-sqlite2
+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:       pygtk2 python-sqlite2
 Requires:       %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -82,114 +72,116 @@
 Developmental files for the core-engine library of GCompris
 
 
+%package sound-cs
+Summary:        GCompris voices in Tsjech
+Group:          Amusements/Games
+
+%description sound-cs
+Voice samples for the GCompris games in Tsjech.
+
+
 %package sound-da
 Summary:        GCompris voices in Danish
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-da
-Voice samples for the GCompris games in Danish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Danish.
 
 
 %package sound-de
 Summary:        GCompris voices in German
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-de
-Voice samples for the GCompris games in German, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in German.
 
 
 %package sound-en
 Summary:        GCompris voices in English
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-en
-Voice samples for the GCompris games in English, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in English.
 
 
 %package sound-es
 Summary:        GCompris voices in Spanish
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-es
-Voice samples for the GCompris games in Spanish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Spanish.
 
 
 %package sound-fi
 Summary:        GCompris voices in Finish
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-fi
-Voice samples for the GCompris games in Finish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Finish.
 
 
 %package sound-fr
 Summary:        GCompris voices in French
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-fr
-Voice samples for the GCompris games in French, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in French.
 
 
 %package sound-hu
 Summary:        GCompris voices in Hungarian
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-hu
-Voice samples for the GCompris games in Hungarian, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Hungarian.
 
 
 %package sound-it
 Summary:        GCompris voices in Italian
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-it
-Voice samples for the GCompris games in Italian, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Italian.
+
+
+%package sound-mr
+Summary:        GCompris voices in Indian Marathi
+Group:          Amusements/Games
+
+%description sound-mr
+Voice samples for the GCompris games in Indian Marathi.
 
 
 %package sound-nl
 Summary:        GCompris voices in Dutch
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-nl
-Voice samples for the GCompris games in Dutch, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Dutch.
 
 
 %package sound-pt
 Summary:        GCompris voices in Portuguese
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-pt
-Voice samples for the GCompris games in Portuguese, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Portuguese.
 
 
 %package sound-ru
 Summary:        GCompris voices in Russian
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-ru
-Voice samples for the GCompris games in Russian, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Russian.
+
+
+%package sound-so
+Summary:        GCompris voices in Somali
+Group:          Amusements/Games
+
+%description sound-so
+Voice samples for the GCompris games in Somali.
 
 
 %package sound-sv
@@ -197,8 +189,15 @@
 Group:          Amusements/Games
 
 %description sound-sv
-Voice samples for the GCompris games in Swedish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Swedish.
+
+
+%package sound-tr
+Summary:        GCompris voices in Turk
+Group:          Amusements/Games
+
+%description sound-tr
+Voice samples for the GCompris games in Turk.
 
 
 %package sound-eu
@@ -206,8 +205,7 @@
 Group:          Amusements/Games
 
 %description sound-eu
-Voice samples for the GCompris games in Basque, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Basque.
 
 
 %package flags
@@ -215,56 +213,20 @@
 Group:          Amusements/Games
 
 %description flags
-Country flags for use with GCompris (60x40 PNG), these come with an assetml
-description so they could potentially be used by other packages.
+Country flags for use with GCompris (60x40 PNG).
 
 
 %prep
 %setup -q
-%patch1 -p1 -z .sysassetml -E
-# no backup files for this patch, otherwise they get installed under /usr/share
-%patch2 -p1
-%patch3 -p1 -z .electric
-%patch4 -p1 -z .click_on_letter
-%patch5 -p1 -z .xf86vm
-%patch6 -p1 -z .xf86vm2
-%patch7 -p1 -z .xf86vm3
+%patch0 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
 mv tmp docs/C/gcompris.info
-# fix gnome.canvas deprecation warnings
-for i in src/boards/python.c `find src/boards/python -name "*.py"`; do
-   %{__sed} -i 's/gnome\.canvas/gnomecanvas/g' $i
-done
-# fix up broken dutch alphabet sounds
-pushd boards/sounds/nl/alphabet
-for i in U007{B..F}.ogg; do
-  mv $i `echo $i|%{__sed} s/7/6/`
-done
-cp %{SOURCE2} .
-popd
-# fix up missing dutch "ok zo" sound
-pushd boards/sounds/nl/misc
-cp ok.ogg check_answer.ogg
-popd
-# fixup african maps with files from CVS (BZ 197758)
-tar xfz %{SOURCE3}
-# these are no longer used
-rm boards/geography/africa/north_africa.xcf \
-  boards/geography/afrique/burundi.png \
-  boards/geography/afrique/djibouti.png \
-  boards/geography/afrique/equatorial_guinea.png \
-  boards/geography/afrique/gambia.png \
-  boards/geography/afrique/guinea_bissau.png \
-  boards/geography/afrique/lesotho.png \
-  boards/geography/afrique/rwanda.png \
-  boards/geography/afrique/sierra_leone.png \
-  boards/geography/afrique/swaziland.png
 
 
 %build
 # The configure check for python-gnome.canvas fails without X running,
 # --enable-py-build-only works around this
-%configure --enable-py-build-only
+%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
@@ -279,8 +241,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6
 rm $RPM_BUILD_ROOT%{_libdir}/libgcompris-1.la
 rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -353,6 +313,7 @@
 %{_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
@@ -365,6 +326,7 @@
 %{_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*
@@ -385,9 +347,15 @@
 %{_libdir}/libgcompris-1.so
 %{_libdir}/pkgconfig/libgcompris-1.0.pc
 
+%files sound-cs
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/cs
+
 %files sound-da
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_da.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -395,7 +363,6 @@
 
 %files sound-de
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_de.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -403,7 +370,6 @@
 
 %files sound-en
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_en.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -411,7 +377,6 @@
 
 %files sound-es
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_es.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -419,7 +384,6 @@
 
 %files sound-fi
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_fi.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -427,7 +391,6 @@
 
 %files sound-fr
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_fr.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -435,7 +398,6 @@
 
 %files sound-hu
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_hu.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -443,15 +405,20 @@
 
 %files sound-it
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_it.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/it
 
+%files sound-mr
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/mr
+
 %files sound-nl
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_nl.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -459,31 +426,42 @@
 
 %files sound-pt
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_pt.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/pt
+%{_datadir}/gcompris/boards/sounds/pt_BR
 
 %files sound-ru
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_ru.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/ru
 
+%files sound-so
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/so
+
 %files sound-sv
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_sv.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/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 sound-eu
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_eu.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -491,13 +469,24 @@
 
 %files flags
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_flags.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %{_datadir}/gcompris/boards/flags
 
 
 %changelog
+* Tue Nov  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.2-1
+- New upstream release 8.2
+- Drop most patches (integrated upstream)
+- Drop seperate / addon man page (integrated upstream)
+
+* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.1-1
+- New upstream release 8.1
+- Drop most patches (integrated upstream)
+
+* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-14
+- FE6 Rebuild
+
 * Sun Aug 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-13
 - Fix BZ 197758 (backport from upstream CVS)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Aug 2006 10:35:38 -0000	1.3
+++ sources	7 Nov 2006 19:16:40 -0000	1.4
@@ -1,2 +1 @@
-d80e55da21170a98d671c98b3e582cc3  gcompris-7.4.tar.gz
-bc3d9ba72b4dd9742859ec6b90d12056  gcompris-africa-patch.tar.gz
+56849e2b09bea6a47eb6f177cc85258f  gcompris-8.2.tar.gz


--- U006A.ogg DELETED ---


--- gcompris-7.4-xf86vidmode.patch DELETED ---


--- gcompris-7.4-xf86vidmode2.patch DELETED ---


--- gcompris-7.4-xf86vidmode3.patch DELETED ---


--- gcompris-click_on_letter.patch DELETED ---


--- gcompris-electric.patch DELETED ---


--- gcompris-nl.patch DELETED ---


--- gcompris-sys-assetml.patch DELETED ---


--- gcompris.6 DELETED ---

More information about the scm-commits mailing list