From 29e7680b3a76bddab821ecc2e387d0f80d69355b Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Jan 17 2008 15:10:36 +0000
Subject: - New upstream version 0.90.2

- Drop upstreamed replace-cfg patch

---

diff --git a/.cvsignore b/.cvsignore
index bb38335..6e9849d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-childsplay-0.90.tgz
+childsplay-0.90.2.tgz
diff --git a/childsplay-0.90-replace-cfg.patch b/childsplay-0.90-replace-cfg.patch
deleted file mode 100644
index 866b7a6..0000000
--- a/childsplay-0.90-replace-cfg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 767c055..94350a8 100644
--- a/childsplay.spec
+++ b/childsplay.spec
@@ -1,5 +1,5 @@
 Name:           childsplay
-Version:        0.90
+Version:        0.90.2
 Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
@@ -8,7 +8,6 @@ URL:            http://childsplay.sourceforge.net/
 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
@@ -28,7 +27,6 @@ package for the languages you intend to use. For example gcompris-sound-en .
 %prep
 %setup -q
 %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
@@ -118,6 +116,10 @@ fi
 
 
 %changelog
+* Thu Jan 17 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.90.2-1
+- New upstream version 0.90.2
+- Drop upstreamed replace-cfg patch
+
 * 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.
diff --git a/sources b/sources
index 127ee37..c9e7aae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d7ff90d00db05cfebd1e87e4b9c9a6f  childsplay-0.90.tgz
+c306702a2e79a861a3f18cb90ff91412  childsplay-0.90.2.tgz