From 66adbe29e21da64eff0368bf04fe689a3fd912cf Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Aug 26 2007 07:24:41 +0000
Subject: - New upstream version 0.90, license changed to GPL version 3, no other

    changes.

---

diff --git a/.cvsignore b/.cvsignore
index 50c55fc..bb38335 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-childsplay-0.85.1.tgz
+childsplay-0.90.tgz
diff --git a/childsplay-0.90-replace-cfg.patch b/childsplay-0.90-replace-cfg.patch
new file mode 100644
index 0000000..866b7a6
--- /dev/null
+++ b/childsplay-0.90-replace-cfg.patch
@@ -0,0 +1,12 @@
+diff -up childsplay-0.90/childsplay.py~ childsplay-0.90/childsplay.py
+--- childsplay-0.90/childsplay.py~	2007-08-26 09:12:46.000000000 +0200
++++ childsplay-0.90/childsplay.py	2007-08-26 09:12:46.000000000 +0200
+@@ -195,7 +195,7 @@ def set_globalrc(dic):
+                 
+         exc = sys.exc_info()[0]
+         print exc
+-        if exc is exceptions.KeyError:
++        if exc is exceptions.KeyError or exc is exceptions.ValueError:
+             replace_rcfile()
+         rcdic = rcdic_defaults
+         set_globalrc(rcdic) # read again
diff --git a/childsplay.spec b/childsplay.spec
index 54097ae..767c055 100644
--- a/childsplay.spec
+++ b/childsplay.spec
@@ -1,14 +1,14 @@
 Name:           childsplay
-Version:        0.85.1
-Release:        3%{?dist}
+Version:        0.90
+Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
-# Note: upstream says the next version will be GPLv3
-License:        GPLv2
+License:        GPLv3
 URL:            http://childsplay.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tgz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
 Source1:        childsplay.desktop
 Patch0:         childsplay-0.81.8-highscore.patch
+Patch1:         childsplay-0.90-replace-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
@@ -27,7 +27,8 @@ package for the languages you intend to use. For example gcompris-sound-en .
 
 %prep
 %setup -q
-%patch0 -p1 -z .highscore
+%patch0 -p1
+%patch1 -p1
 # we don't use the buggy provided install
 rm install.py
 # the translation is merged into the assetml file, so don't ship it seperatly
@@ -117,6 +118,10 @@ fi
 
 
 %changelog
+* Sun Aug 26 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.90-1
+- New upstream version 0.90, license changed to GPL version 3,
+  no other changes.
+
 * Mon Aug  6 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.85.1-3 
 - Update License tag for new Licensing Guidelines compliance
 
diff --git a/sources b/sources
index f75de3e..127ee37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-427ab5f69e12f12a6af8824e5cd92ff9  childsplay-0.85.1.tgz
+1d7ff90d00db05cfebd1e87e4b9c9a6f  childsplay-0.90.tgz