rpms/gcompris/F-11 gcompris-8.4.13-icon.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 gcompris.spec, 1.45, 1.46 sources, 1.21, 1.22 gcompris-8.1-icon.patch, 1.1, NONE

Johan Cwiklinski trasher at fedoraproject.org
Sat Oct 24 10:11:36 UTC 2009 

Author: trasher

Update of /cvs/extras/rpms/gcompris/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14431

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-8.4.13-icon.patch 
Removed Files:
	gcompris-8.1-icon.patch 
Log Message:
New upstream release (8.4.13)
Noarch for sound packages


gcompris-8.4.13-icon.patch:
 gcompris.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gcompris-8.4.13-icon.patch ---
diff -up gcompris-8.4.13/src/gcompris/gcompris.c.patch gcompris-8.4.13/src/gcompris/gcompris.c
--- gcompris-8.4.13/src/gcompris/gcompris.c.patch	2009-10-20 07:48:56.000000000 +0200
+++ gcompris-8.4.13/src/gcompris/gcompris.c	2009-10-20 07:49:48.000000000 +0200
@@ -667,7 +667,7 @@ static void setup_window ()
    * 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(!icon_file)
       g_warning ("Couldn't find file %s !", icon_file);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	29 Mar 2009 17:47:03 -0000	1.18
+++ .cvsignore	24 Oct 2009 10:11:36 -0000	1.19
@@ -1 +1 @@
-gcompris-8.4.12.tar.gz
+gcompris-8.4.13.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/F-11/gcompris.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- gcompris.spec	29 Mar 2009 17:47:03 -0000	1.45
+++ gcompris.spec	24 Oct 2009 10:11:36 -0000	1.46
@@ -1,12 +1,12 @@
 Name:           gcompris
-Version:        8.4.12
+Version:        8.4.13
 Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
 URL:            http://gcompris.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         gcompris-8.1-icon.patch
+Patch0:         gcompris-8.4.13-icon.patch
 Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
@@ -64,6 +64,7 @@ Plus de 100 activités sont proposées :
 %package sound-ar
 Summary:        GCompris voices in Arabic (Tunisia)
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-ar
 Voice samples for the GCompris games in Arabic (Tunisia).
@@ -72,6 +73,7 @@ Voice samples for the GCompris games in 
 %package sound-cs
 Summary:        GCompris voices in Tsjech
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-cs
 Voice samples for the GCompris games in Tsjech.
@@ -80,6 +82,7 @@ Voice samples for the GCompris games in 
 %package sound-da
 Summary:        GCompris voices in Danish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-da
 Voice samples for the GCompris games in Danish.
@@ -88,6 +91,7 @@ Voice samples for the GCompris games in 
 %package sound-de
 Summary:        GCompris voices in German
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-de
 Voice samples for the GCompris games in German.
@@ -96,6 +100,7 @@ Voice samples for the GCompris games in 
 %package sound-el
 Summary:        GCompris voices in Greek
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-el
 Voice samples for the GCompris games in Greek.
@@ -104,6 +109,7 @@ Voice samples for the GCompris games in 
 %package sound-en
 Summary:        GCompris voices in English
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-en
 Voice samples for the GCompris games in English.
@@ -112,6 +118,7 @@ Voice samples for the GCompris games in 
 %package sound-es
 Summary:        GCompris voices in Spanish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-es
 Voice samples for the GCompris games in Spanish.
@@ -120,6 +127,7 @@ Voice samples for the GCompris games in 
 %package sound-eu
 Summary:        GCompris voices in Basque
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-eu
 Voice samples for the GCompris games in Basque.
@@ -128,6 +136,7 @@ Voice samples for the GCompris games in 
 %package sound-fi
 Summary:        GCompris voices in Finish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-fi
 Voice samples for the GCompris games in Finish.
@@ -136,6 +145,7 @@ Voice samples for the GCompris games in 
 %package sound-fr
 Summary:        GCompris voices in French
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-fr
 Voice samples for the GCompris games in French.
@@ -144,6 +154,7 @@ Voice samples for the GCompris games in 
 %package sound-hi
 Summary:        GCompris voices in Hindi
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-hi
 Voice samples for the GCompris games in Hindi.
@@ -152,6 +163,7 @@ Voice samples for the GCompris games in 
 %package sound-hu
 Summary:        GCompris voices in Hungarian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-hu
 Voice samples for the GCompris games in Hungarian.
@@ -160,6 +172,7 @@ Voice samples for the GCompris games in 
 %package sound-id
 Summary:        GCompris voices in Indonesian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-id
 Voice samples for the GCompris games in Indonesian.
@@ -168,6 +181,7 @@ Voice samples for the GCompris games in 
 %package sound-it
 Summary:        GCompris voices in Italian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-it
 Voice samples for the GCompris games in Italian.
@@ -176,6 +190,7 @@ Voice samples for the GCompris games in 
 %package sound-mr
 Summary:        GCompris voices in Indian Marathi
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-mr
 Voice samples for the GCompris games in Indian Marathi.
@@ -184,6 +199,7 @@ Voice samples for the GCompris games in 
 %package sound-nb
 Summary:        GCompris voices in Norwegian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-nb
 Voice samples for the GCompris games in Norwegian.
@@ -192,6 +208,7 @@ Voice samples for the GCompris games in 
 %package sound-nl
 Summary:        GCompris voices in Dutch
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-nl
 Voice samples for the GCompris games in Dutch.
@@ -200,6 +217,7 @@ Voice samples for the GCompris games in 
 %package sound-pt
 Summary:        GCompris voices in Portuguese
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-pt
 Voice samples for the GCompris games in Portuguese.
@@ -208,6 +226,7 @@ Voice samples for the GCompris games in 
 %package sound-ru
 Summary:        GCompris voices in Russian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-ru
 Voice samples for the GCompris games in Russian.
@@ -216,6 +235,7 @@ Voice samples for the GCompris games in 
 %package sound-so
 Summary:        GCompris voices in Somali
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-so
 Voice samples for the GCompris games in Somali.
@@ -224,6 +244,7 @@ Voice samples for the GCompris games in 
 %package sound-sr
 Summary:        GCompris voices in Serbian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-sr
 Voice samples for the GCompris games in Serbian.
@@ -232,6 +253,7 @@ Voice samples for the GCompris games in 
 %package sound-sv
 Summary:        GCompris voices in Swedish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-sv
 Voice samples for the GCompris games in Swedish.
@@ -240,6 +262,7 @@ Voice samples for the GCompris games in 
 %package sound-tr
 Summary:        GCompris voices in Turk
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-tr
 Voice samples for the GCompris games in Turk.
@@ -248,6 +271,7 @@ Voice samples for the GCompris games in 
 %package flags
 Summary:        Country flags for use with GCompris (60x40 PNG)
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description flags
 Country flags for use with GCompris (60x40 PNG).
@@ -261,6 +285,8 @@ iconv -f ISO-8859-1 -t UTF8 docs/C/%{nam
 mv tmp docs/C/%{name}.info
 iconv -f ISO-8859-1 -t UTF8 AUTHORS > tmp
 mv tmp AUTHORS
+iconv -f ISO-8859-1 -t UTF8 ChangeLog > tmp
+mv tmp ChangeLog
 
 
 %build
@@ -299,6 +325,10 @@ desktop-file-install --vendor fedora --d
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-edit.desktop
 
+#remove not needeed ".desktop" file (use for windows build)
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/nsis_translations.desktop
+
+
 mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
 mv $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}.png \
   $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}-edit.png \
@@ -503,6 +533,9 @@ fi
 
 
 %changelog
+* Sat Oct 24 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 8.4.13-1
+- New upstream bugfix release 8.4.13
+
 * Sun Mar 29 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 8.4.12-1
 - New upstream bugfix release 8.4.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	29 Mar 2009 17:47:03 -0000	1.21
+++ sources	24 Oct 2009 10:11:36 -0000	1.22
@@ -1 +1 @@
-8a1519e71caa0924d5df73faa311eea3  gcompris-8.4.12.tar.gz
+d4768c2c471da4f1eb12a82d37f54dc1  gcompris-8.4.13.tar.gz


--- gcompris-8.1-icon.patch DELETED ---

More information about the fedora-extras-commits mailing list