[gcompris] New upstream release 14.05 (rhbz#1083910)

Tue Jun 3 12:18:39 UTC 2014

commit 1e38a7e1a1c84b3ae7aa522302267ea3d89ce1c2
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Jun 3 13:20:46 2014 +0200

    New upstream release 14.05 (rhbz#1083910)

 .gitignore                               |    1 +
 gcompris-13.11-watercycle-hydropow.patch |  119 ------------------------------
 gcompris.appdata.xml                     |   37 +++++++++
 gcompris.spec                            |   26 ++++---
 sources                                  |    3 +-
 5 files changed, 55 insertions(+), 131 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index da4c169..bd633c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ gcompris-9.3.tar.gz
 /gcompris-12.11.tar.bz2
 /gcompris-13.11.tar.bz2
 /hydroelectric.svgz
+/gcompris-14.05.tar.bz2
diff --git a/gcompris.appdata.xml b/gcompris.appdata.xml
new file mode 100644
index 0000000..15fda37
--- /dev/null
+++ b/gcompris.appdata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+  <id type="desktop">gcompris.desktop</id>
+  <metadata_license>CC-BY-SA-3.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <description>
+    <p>GCompris / I Got IT is an educational software suite comprising of
+       numerous activities for children aged 2 to 10.</p>
+    <p>Some of the activities are game orientated, but nonetheless still
+       educational.</p>
+    <p>Below you can find a list of categories with some of the activities
+       available in that category.</p>
+    <ul>
+    <li>computer discovery: keyboard, mouse, different mouse gesture, ...</li>
+    <li>arithmetic: table memory, enumeration, double entry table, mirror
+        image, ...</li>
+    <li>science: the canal lock, the water cycle, the submarine, electric
+        simulation, ...</li>
+    <li>geography: place the country on the map</li>
+    <li>games: chess, memory, connect 4, oware, sudoku, ...</li>
+    <li>reading: reading practice</li>
+    <li>other: learn to tell time, puzzle of famous paintings, vector
+        drawing, cartoon making, ...</li>
+    </ul>
+    <p>Currently GCompris offers in excess of 100 activities and more are
+       being developed. GCompris is free software, that means that you can
+       adapt it to your own needs, improve it and, most importantly, share it
+       with children everywhere.</p> 
+  </description>
+  <screenshots>
+    <screenshot width="400" height="260" type="default">http://gcompris.net/screenshots/canal_lock.jpg</screenshot>
+    <screenshot width="400" height="260">http://gcompris.net/screenshots/play_piano.jpg</screenshot>
+    <screenshot width="400" height="260">http://gcompris.net/screenshots/memory.jpg</screenshot>
+  </screenshots>
+  <url type="homepage">http://gcompris.net/</url>
+  <updatecontact>bruno.coudoin at free.fr</updatecontact>
+</application>
diff --git a/gcompris.spec b/gcompris.spec
index 35c12a4..512a494 100644
--- a/gcompris.spec
+++ b/gcompris.spec
@@ -1,15 +1,14 @@
 Name:           gcompris
-Version:        13.11
-Release:        2%{?dist}
+Version:        14.05
+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.bz2
-Source1:        hydroelectric.svgz
+Source1:        gcompris.appdata.xml
 Patch0:         gcompris-9.0-icon.patch
 Patch1:         gcompris-13.11-use-bundled-gnuchess.patch
-Patch2:         gcompris-13.11-watercycle-hydropow.patch
 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 gstreamer-devel
@@ -29,8 +28,9 @@ Obsoletes:      %{name}-flags < %{version}-%{release}
 Provides:       %{name}-flags = %{version}-%{release}
 
 %description
-GCompris / I Got IT is an educationnal game for children starting at 2.
-More than 100 different activities are proposed:
+GCompris / I Got IT is an educational software suite comprising of numerous
+activities for children aged 2 to 10. More than 100 different activities are
+included:
 * Click on the animals => learn the mouse/click usage
 * Type the falling letters => learn the keyboard usage
 * Falling Dices
@@ -447,7 +447,6 @@ Voice samples for the GCompris games in Chinese, Simplified.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 for file in AUTHORS ChangeLog; do
     iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
     touch -r $file $file.new && \
@@ -465,20 +464,23 @@ make
 # breaks the translations
 sed -i \
   -e 's/Name=Educational suite GCompris/Name=GCompris Educational suite/' \
-  -e 's/Categories=Game;KidsGame;/Categories=Education;/' \
+  -e 's/Categories=Education;Game;KidsGame;/Categories=Education;/' \
   %{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;/' \
+  -e 's/Categories=Settings;/Categories=Education;/' \
   %{name}-edit.desktop
 
 
 %install
 %make_install
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/boards/hydroelectric
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la
 %find_lang %{name}
 
+# install the appdata file
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata
+
 # below is the desktop file and icon stuff.
 desktop-file-install --delete-original                  \
 %if 0%{?fedora} && 0%{?fedora} < 19
@@ -527,6 +529,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/boards/voices/*
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/icons/hicolor/48x48/apps/%{name}*.png
 %{_datadir}/applications/*%{name}*.desktop
 
@@ -647,6 +650,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Jun  3 2014 Hans de Goede <hdegoede at redhat.com> - 14.05-1
+- New upstream release 14.05 (rhbz#1083910)
+
 * Tue Nov 26 2013 Hans de Goede <hdegoede at redhat.com> - 13.11-2
 - Fix water cycle and renewable energy activities (rhbz#1034132)
 
diff --git a/sources b/sources
index da0f9da..3838e32 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-7c3396c02e44bbf72424ca12bfff9cf3  gcompris-13.11.tar.bz2
-b834c9066dfe8fe36e583e531dfc5877  hydroelectric.svgz
+5604ff13bc128a1ee951026de52c3def  gcompris-14.05.tar.bz2
