rpms/childsplay/devel .cvsignore, 1.2, 1.3 childsplay-0.81.8-assetml.patch, 1.1, 1.2 childsplay.spec, 1.3, 1.4 sources, 1.2, 1.3
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sun Aug 27 12:19:49 UTC 2006
- Previous message (by thread): rpms/bochs/FC-5 .cvsignore, 1.6, 1.7 bochs.spec, 1.17, 1.18 sources, 1.6, 1.7 bochs-dlxreadme.patch, 1.1, NONE bochs-wx26.patch, 1.3, NONE
- Next message (by thread): rpms/childsplay_plugins/devel .cvsignore, 1.3, 1.4 childsplay_plugins-0.80.8-assetml.patch, 1.1, 1.2 childsplay_plugins.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/childsplay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12112
Modified Files:
.cvsignore childsplay-0.81.8-assetml.patch childsplay.spec
sources
Log Message:
* Sun Aug 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-1
- New upstream version 0.83
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 11 May 2006 13:20:41 -0000 1.2
+++ .cvsignore 27 Aug 2006 12:19:49 -0000 1.3
@@ -1 +1 @@
-childsplay-0.81.8.tgz
+childsplay-0.83.tgz
childsplay-0.81.8-assetml.patch:
Index: childsplay-0.81.8-assetml.patch
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/childsplay-0.81.8-assetml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- childsplay-0.81.8-assetml.patch 11 May 2006 13:20:41 -0000 1.1
+++ childsplay-0.81.8-assetml.patch 27 Aug 2006 12:19:49 -0000 1.2
@@ -1,58 +1,5 @@
---- childsplay-0.81.8/assetml/childsplay/memory-136x136/memory-136x136.assetml.assetml 2006-05-05 15:59:55.000000000 +0200
-+++ childsplay-0.81.8/assetml/childsplay/memory-136x136/memory-136x136.assetml 2006-05-05 16:00:09.000000000 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="UTF-8"?>
--<AssetML dataset="" rootdir="../childsplay/memory/" locale="en">
-+<AssetML dataset="" rootdir="../childsplay/memory-136x136/" locale="en">
- <Asset file="apple.png" mimetype="image/png">
- <Description>Apple</Description>
- <Description xml:lang="ar">تÙاØØ©</Description>
---- childsplay-0.81.8/pyassetml.py.assetml 2006-04-09 11:11:02.000000000 +0200
-+++ childsplay-0.81.8/pyassetml.py 2006-05-05 15:58:28.000000000 +0200
-@@ -164,9 +164,9 @@
- rootnode = self.xml.getElementsByTagName('AssetML')[0]
- self.root_obj = RootNode()
- self.root_obj.dataset = rootnode.attributes[u'dataset'].value
-- path = rootnode.attributes[u'rootdir'].value[3:] #path starts with ../, loose it
-- #self.root_obj.rootdir = os.path.join(self.parserroot, path)
-- self.root_obj.rootdir = self.parserroot
-+ path = rootnode.attributes[u'rootdir'].value
-+ self.root_obj.rootdir = os.path.join(self.parserroot, path)
-+ #self.root_obj.rootdir = self.parserroot
- self.root_obj.locale = rootnode.attributes[u'locale'].value
-
- for node in self.xmlnodes:
---- childsplay-0.81.8/childsplay.py.assetml 2006-04-09 11:11:02.000000000 +0200
-+++ childsplay-0.81.8/childsplay.py 2006-05-05 15:58:28.000000000 +0200
-@@ -301,10 +301,10 @@
-
- # create two assetmlSDL instances one for parsing images and one for sounds
- Assets_img = pyassetmlSDL.AssetmlSDL()
--Assets_img.set_mldir('childsplay/childsplay-images/childsplay-images.assetml')
-+Assets_img.set_mldir('childsplay-images.assetml')
-
- Assets_snd = pyassetmlSDL.AssetmlSDL()
--Assets_snd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml')
-+Assets_snd.set_mldir('childsplay-sounds.assetml')
-
- ############################################
- ########### End toplevel code #####################
---- childsplay-0.81.8/lib/memory.py.assetml 2006-04-09 11:11:03.000000000 +0200
-+++ childsplay-0.81.8/lib/memory.py 2006-05-05 15:58:28.000000000 +0200
-@@ -57,9 +57,9 @@
- raise MyError,text
- # create two assetmlSDL instances one for parsing images and one for sounds
- self.Assets_img = pyassetmlSDL.AssetmlSDL()
-- self.Assets_img.set_mldir('childsplay/memory-136x136/memory-136x136.assetml')
-+ self.Assets_img.set_mldir('memory-136x136.assetml')
- self.Assets_snd = pyassetmlSDL.AssetmlSDL()
-- self.Assets_snd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml')
-+ self.Assets_snd.set_mldir('childsplay-sounds.assetml')
-
- self.libdir = libdir
- # This will also used as a test if we are using other images
---- childsplay-0.81.8/lib/letters.py.assetml 2006-04-09 11:11:03.000000000 +0200
-+++ childsplay-0.81.8/lib/letters.py 2006-05-05 15:58:28.000000000 +0200
+--- childsplay-0.83/lib/letters.py.aap 2006-08-27 10:53:03.000000000 +0200
++++ childsplay-0.83/lib/letters.py 2006-08-27 14:09:03.000000000 +0200
@@ -98,13 +98,13 @@
if DEBUG: print "ChildsplayGoodies",dir(ChildsplayGoodies)
# create two assetmlSDL instances one for parsing images and one for sounds
@@ -79,3 +26,62 @@
files = ('bummer.wav','wahoo.wav')
self.Assets_snd.get_assets(files, Snd)
+--- childsplay-0.83/lib/memory.py.aap 2006-08-27 10:53:03.000000000 +0200
++++ childsplay-0.83/lib/memory.py 2006-08-27 14:09:03.000000000 +0200
+@@ -55,9 +55,9 @@
+ raise MyError,text
+ # create two assetmlSDL instances one for parsing images and one for sounds
+ self.Assets_img = pyassetmlSDL.AssetmlSDL()
+- self.Assets_img.set_mldir('childsplay/memory-136x136/memory-136x136.assetml')
++ self.Assets_img.set_mldir('memory-136x136.assetml')
+ self.Assets_snd = pyassetmlSDL.AssetmlSDL()
+- self.Assets_snd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml')
++ self.Assets_snd.set_mldir('childsplay-sounds.assetml')
+
+ self.libdir = libdir
+ # This will also used as a test if we are using other images
+--- childsplay-0.83/assetml/childsplay/memory-136x136/memory-136x136.assetml.aap 2006-08-27 10:53:03.000000000 +0200
++++ childsplay-0.83/assetml/childsplay/memory-136x136/memory-136x136.assetml 2006-08-27 14:09:03.000000000 +0200
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<AssetML dataset="" rootdir="../childsplay/memory/" locale="en">
++<AssetML dataset="" rootdir="../childsplay/memory-136x136/" locale="en">
+ <Asset file="apple.png" mimetype="image/png">
+ <Description>Apple</Description>
+ <Description xml:lang="ar">تÙاØØ©</Description>
+--- childsplay-0.83/childsplay.py.aap 2006-08-27 10:53:02.000000000 +0200
++++ childsplay-0.83/childsplay.py 2006-08-27 14:09:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ """
+ Copyright (C) 2002-2006 Stas Z. <stas.zytkiewicz at gmail.com>
+@@ -291,10 +291,10 @@
+
+ # create two assetmlSDL instances one for parsing images and one for sounds
+ Assets_img = pyassetmlSDL.AssetmlSDL()
+-Assets_img.set_mldir('childsplay/childsplay-images/childsplay-images.assetml')
++Assets_img.set_mldir('childsplay-images.assetml')
+
+ Assets_snd = pyassetmlSDL.AssetmlSDL()
+-Assets_snd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml')
++Assets_snd.set_mldir('childsplay-sounds.assetml')
+
+ ############################################
+ ########### End toplevel code #####################
+--- childsplay-0.83/pyassetml.py.aap 2006-08-27 10:53:02.000000000 +0200
++++ childsplay-0.83/pyassetml.py 2006-08-27 14:09:03.000000000 +0200
+@@ -164,9 +164,9 @@
+ rootnode = self.xml.getElementsByTagName('AssetML')[0]
+ self.root_obj = RootNode()
+ self.root_obj.dataset = rootnode.attributes[u'dataset'].value
+- path = rootnode.attributes[u'rootdir'].value[3:] #path starts with ../, loose it
+- #self.root_obj.rootdir = os.path.join(self.parserroot, path)
+- self.root_obj.rootdir = self.parserroot
++ path = rootnode.attributes[u'rootdir'].value
++ self.root_obj.rootdir = os.path.join(self.parserroot, path)
++ #self.root_obj.rootdir = self.parserroot
+ self.root_obj.locale = rootnode.attributes[u'locale'].value
+
+ for node in self.xmlnodes:
Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- childsplay.spec 11 May 2006 13:39:03 -0000 1.3
+++ childsplay.spec 27 Aug 2006 12:19:49 -0000 1.4
@@ -1,18 +1,18 @@
Name: childsplay
-Version: 0.81.8
-Release: 3%{?dist}
+Version: 0.83
+Release: 1%{?dist}
Summary: Suite of educational games for young children
Group: Amusements/Games
License: GPL
URL: http://childsplay.sourceforge.net/
-Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tgz
+Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tgz
Source1: childsplay.desktop
Patch0: childsplay-0.81.8-highscore.patch
Patch1: childsplay-0.81.8-assetml.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: desktop-file-utils
-Requires: pygame, childsplay_plugins >= 0.80.7
+Requires: pygame, childsplay_plugins >= 0.83
%description
Childsplay is a suite of educational games for young children. It's written in
@@ -37,7 +37,7 @@
sed -i 's!/usr/bin/env python!%{_bindir}/python!' %{name}.py letters-trans.py
chmod 755 %{name}.py letters-trans.py pyassetmlcreator.py
# move these out of Data so our wildcard install doesn't install them
-mv Data/*.txt Data/chpl-icon-48*.png Data/childsplay.* .
+mv Data/*.txt Data/logo_cp_*.png Data/childsplay.* .
%build
# INSTALL.sh is seriously borked, so DIY
@@ -82,8 +82,14 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
%{SOURCE1}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 chpl-icon-48.png \
+install -p -m 644 logo_cp_16x16.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+install -p -m 644 logo_cp_32x32.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -p -m 644 logo_cp_48x48.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
@@ -125,10 +131,13 @@
%{_datadir}/assetml
%{_mandir}/man6/*.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%changelog
+* Sun Aug 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-1
+- New upstream version 0.83
+
* Thu May 11 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.81.8-3
- Fix not finding of initial/default childsplayrc file.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 11 May 2006 13:20:41 -0000 1.2
+++ sources 27 Aug 2006 12:19:49 -0000 1.3
@@ -1 +1 @@
-2353509fda8cf7d32c8a10ebd8390370 childsplay-0.81.8.tgz
+037aafb0a3ca8b16a596c06a9074cc20 childsplay-0.83.tgz
- Previous message (by thread): rpms/bochs/FC-5 .cvsignore, 1.6, 1.7 bochs.spec, 1.17, 1.18 sources, 1.6, 1.7 bochs-dlxreadme.patch, 1.1, NONE bochs-wx26.patch, 1.3, NONE
- Next message (by thread): rpms/childsplay_plugins/devel .cvsignore, 1.3, 1.4 childsplay_plugins-0.80.8-assetml.patch, 1.1, 1.2 childsplay_plugins.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list