rpms/gcompris/devel .cvsignore, 1.2, 1.3 gcompris.spec, 1.12, 1.13 sources, 1.2, 1.3
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sun Aug 13 10:32:44 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3241
Modified Files:
.cvsignore gcompris.spec sources
Log Message:
* 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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 30 Apr 2006 08:28:51 -0000 1.2
+++ .cvsignore 13 Aug 2006 10:32:43 -0000 1.3
@@ -1 +1,2 @@
gcompris-7.4.tar.gz
+gcompris-africa-patch.tar.gz
Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcompris.spec 3 Jul 2006 20:33:24 -0000 1.12
+++ gcompris.spec 13 Aug 2006 10:32:43 -0000 1.13
@@ -1,13 +1,14 @@
Name: gcompris
Version: 7.4
-Release: 12%{?dist}
+Release: 13%{?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
+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
@@ -83,7 +84,7 @@
%package sound-da
Summary: GCompris voices in Danish
-Group: Amusements/Games
+Group: Amusements/Games
Requires: /usr/share/assetml
%description sound-da
@@ -93,7 +94,7 @@
%package sound-de
Summary: GCompris voices in German
-Group: Amusements/Games
+Group: Amusements/Games
Requires: /usr/share/assetml
%description sound-de
@@ -103,7 +104,7 @@
%package sound-en
Summary: GCompris voices in English
-Group: Amusements/Games
+Group: Amusements/Games
Requires: /usr/share/assetml
%description sound-en
@@ -113,7 +114,7 @@
%package sound-es
Summary: GCompris voices in Spanish
-Group: Amusements/Games
+Group: Amusements/Games
Requires: /usr/share/assetml
%description sound-es
@@ -123,7 +124,7 @@
%package sound-fi
Summary: GCompris voices in Finish
-Group: Amusements/Games
+Group: Amusements/Games
Requires: /usr/share/assetml
%description sound-fi
@@ -133,7 +134,7 @@
%package sound-fr
Summary: GCompris voices in French
-Group: Amusements/Games
+Group: Amusements/Games
Requires: /usr/share/assetml
%description sound-fr
@@ -143,7 +144,7 @@
%package sound-hu
Summary: GCompris voices in Hungarian
-Group: Amusements/Games
+Group: Amusements/Games
Requires: /usr/share/assetml
%description sound-hu
@@ -153,7 +154,7 @@
%package sound-it
Summary: GCompris voices in Italian
-Group: Amusements/Games
+Group: Amusements/Games
Requires: /usr/share/assetml
%description sound-it
@@ -163,7 +164,7 @@
%package sound-nl
Summary: GCompris voices in Dutch
-Group: Amusements/Games
+Group: Amusements/Games
Requires: /usr/share/assetml
%description sound-nl
@@ -173,7 +174,7 @@
%package sound-pt
Summary: GCompris voices in Portuguese
-Group: Amusements/Games
+Group: Amusements/Games
Requires: /usr/share/assetml
%description sound-pt
@@ -183,7 +184,7 @@
%package sound-ru
Summary: GCompris voices in Russian
-Group: Amusements/Games
+Group: Amusements/Games
Requires: /usr/share/assetml
%description sound-ru
@@ -193,7 +194,7 @@
%package sound-sv
Summary: GCompris voices in Swedish
-Group: Amusements/Games
+Group: Amusements/Games
%description sound-sv
Voice samples for the GCompris games in Swedish, these come with an assetml
@@ -202,7 +203,7 @@
%package sound-eu
Summary: GCompris voices in Basque
-Group: Amusements/Games
+Group: Amusements/Games
%description sound-eu
Voice samples for the GCompris games in Basque, these come with an assetml
@@ -211,7 +212,7 @@
%package flags
Summary: Country flags for use with GCompris (60x40 PNG)
-Group: Amusements/Games
+Group: Amusements/Games
%description flags
Country flags for use with GCompris (60x40 PNG), these come with an assetml
@@ -245,6 +246,19 @@
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
@@ -484,6 +498,9 @@
%changelog
+* Sun Aug 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-13
+- Fix BZ 197758 (backport from upstream CVS)
+
* Mon Jul 3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-12
- Restore the original resolution and ungrab the mouse on focus out, redo
on focus in. This allows alt-tab-ing away when in fullscreen mode. And
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 30 Apr 2006 08:28:51 -0000 1.2
+++ sources 13 Aug 2006 10:32:43 -0000 1.3
@@ -1 +1,2 @@
d80e55da21170a98d671c98b3e582cc3 gcompris-7.4.tar.gz
+bc3d9ba72b4dd9742859ec6b90d12056 gcompris-africa-patch.tar.gz
More information about the fedora-extras-commits
mailing list