rpms/childsplay/devel childsplay-0.90-replace-cfg.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 childsplay.spec, 1.10, 1.11 sources, 1.6, 1.7

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12931

Modified Files:
	.cvsignore childsplay.spec sources 
Added Files:
	childsplay-0.90-replace-cfg.patch 
Log Message:
* Sun Aug 26 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.90-1
- New upstream version 0.90, license changed to GPL version 3,
  no other changes.


childsplay-0.90-replace-cfg.patch:

--- NEW FILE childsplay-0.90-replace-cfg.patch ---
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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Jan 2007 12:38:47 -0000	1.6
+++ .cvsignore	26 Aug 2007 07:24:41 -0000	1.7
@@ -1 +1 @@
-childsplay-0.85.1.tgz
+childsplay-0.90.tgz


Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- childsplay.spec	6 Aug 2007 08:09:15 -0000	1.10
+++ childsplay.spec	26 Aug 2007 07:24:41 -0000	1.11
@@ -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 @@
 
 %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 @@
 
 
 %changelog
+* Sun Aug 26 2007 Hans de Goede <j.w.r.degoede at 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 at hhs.nl> 0.85.1-3 
 - Update License tag for new Licensing Guidelines compliance
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Jan 2007 12:38:47 -0000	1.6
+++ sources	26 Aug 2007 07:24:41 -0000	1.7
@@ -1 +1 @@
-427ab5f69e12f12a6af8824e5cd92ff9  childsplay-0.85.1.tgz
+1d7ff90d00db05cfebd1e87e4b9c9a6f  childsplay-0.90.tgz