From d07ae37153f578e0ac9d89ca465c63c71757049b Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <trasher@fedoraproject.org>
Date: Apr 13 2010 17:25:41 +0000
Subject: New upstream bugfix release


---

diff --git a/.cvsignore b/.cvsignore
index a426d77..85bd7b7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,3 @@
-childsplay-1.4.tgz
 alphabet_sounds_bg-0.9.tgz
 alphabet_sounds_ca-0.9.tgz
 alphabet_sounds_de-0.9.tgz
@@ -15,3 +14,4 @@ alphabet_sounds_ro-0.9.tgz
 alphabet_sounds_ru-0.9.tgz
 alphabet_sounds_sl-0.9.tgz
 alphabet_sounds_sv-0.9.tgz
+childsplay-1.5.tgz
diff --git a/childsplay-1.4-lang_switch.patch b/childsplay-1.4-lang_switch.patch
deleted file mode 100644
index 6952417..0000000
--- a/childsplay-1.4-lang_switch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up childsplay-1.4/utils.py.patch childsplay-1.4/utils.py
---- childsplay-1.4/utils.py.patch	2009-10-23 19:55:08.000000000 +0200
-+++ childsplay-1.4/utils.py	2009-10-23 19:56:40.000000000 +0200
-@@ -114,7 +114,7 @@ def get_locale():
-         if lang == '':
-             lang = locale.getdefaultlocale()[0].split('_')[0]
-     except Exception, info:
--        module_logger.error("%s, %s" % info, "Switching to English")
-+        module_logger.error("%s, %s" % (info, "Switching to English"))
-         lang = 'en'
-     if lang == 'C' or lang.lower() == 'posix':
-         # Default to English
diff --git a/childsplay.spec b/childsplay.spec
index fea1bdd..0a25342 100644
--- a/childsplay.spec
+++ b/childsplay.spec
@@ -2,32 +2,31 @@
 %define alphabet_ver 0.9
 
 Name:           childsplay
-Version:        1.4
-Release:        2%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
 License:        GPLv3
 URL:            http://www.schoolsplay.org/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
+Source0:        http://downloads.sourceforge.net/schoolsplay/%{name}-%{version}.tgz
 Source1:        childsplay.desktop
 Source2:        childsplay.README.RPM
-Source10:       alphabet_sounds_bg-%{alphabet_ver}.tgz
-Source11:       alphabet_sounds_ca-%{alphabet_ver}.tgz
-Source12:       alphabet_sounds_de-%{alphabet_ver}.tgz
-Source13:       alphabet_sounds_el-%{alphabet_ver}.tgz
-Source14:       alphabet_sounds_en_GB-%{alphabet_ver}.tgz
-Source15:       alphabet_sounds_es-%{alphabet_ver}.tgz
-Source16:       alphabet_sounds_fr-%{alphabet_ver}.tgz
-Source17:       alphabet_sounds_it-%{alphabet_ver}.tgz
-Source18:       alphabet_sounds_lt-%{alphabet_ver}.tgz
-Source19:       alphabet_sounds_nb-%{alphabet_ver}.tgz
-Source20:       alphabet_sounds_nl-%{alphabet_ver}.tgz
-Source21:       alphabet_sounds_pt-%{alphabet_ver}.tgz
-Source22:       alphabet_sounds_ro-%{alphabet_ver}.tgz
-Source23:       alphabet_sounds_ru-%{alphabet_ver}.tgz
-Source24:       alphabet_sounds_sl-%{alphabet_ver}.tgz
-Source25:       alphabet_sounds_sv-%{alphabet_ver}.tgz
-Patch0:         childsplay-1.4-lang_switch.patch
+Source10:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_bg-%{alphabet_ver}.tgz
+Source11:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_ca-%{alphabet_ver}.tgz
+Source12:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_de-%{alphabet_ver}.tgz
+Source13:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_el-%{alphabet_ver}.tgz
+Source14:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_en_GB-%{alphabet_ver}.tgz
+Source15:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_es-%{alphabet_ver}.tgz
+Source16:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_fr-%{alphabet_ver}.tgz
+Source17:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_it-%{alphabet_ver}.tgz
+Source18:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_lt-%{alphabet_ver}.tgz
+Source19:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_nb-%{alphabet_ver}.tgz
+Source20:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_nl-%{alphabet_ver}.tgz
+Source21:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_pt-%{alphabet_ver}.tgz
+Source22:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_ro-%{alphabet_ver}.tgz
+Source23:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_ru-%{alphabet_ver}.tgz
+Source24:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_sl-%{alphabet_ver}.tgz
+Source25:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_sv-%{alphabet_ver}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -201,7 +200,6 @@ pushd  alphabet_sounds_lt-%{alphabet_ver}/AlphabetSounds
 mkdir lt
 mv *.* lt
 popd
-%patch0 -p1
 
 
 %build
@@ -404,6 +402,10 @@ fi
 
 
 %changelog
+* Mon Apr 13 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 1.5-1
+- 1.5
+- Update Sources URL making rpmlint happy
+
 * Fri Oct 23 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-2
 - fix get_locale issue (bug #530599)
 
diff --git a/sources b/sources
index 7219341..41b53a0 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-80251bd541071ad80419c7671c55b45c  childsplay-1.4.tgz
 6edf3f5bdcd72b0be8b6b39090ba550b  alphabet_sounds_bg-0.9.tgz
 4d364cf6c8ea2d0de76e549112736f76  alphabet_sounds_ca-0.9.tgz
 bca24f936474862f03dee738f17b32df  alphabet_sounds_de-0.9.tgz
@@ -15,3 +14,4 @@ c8dccd02255b0530674a740a75cb7537  alphabet_sounds_nl-0.9.tgz
 8019fbfcb83e76bee6e1f5d721c663bf  alphabet_sounds_ru-0.9.tgz
 bb66cad97471022c0221209fe45ec6fb  alphabet_sounds_sl-0.9.tgz
 1dafe67b13cce379d97efe420d428ed2  alphabet_sounds_sv-0.9.tgz
+c2a456415546ae4ef39076d29b215365  childsplay-1.5.tgz