rpms/childsplay/devel childsplay-0.81.8-assetml.patch, NONE, 1.1 childsplay-0.81.8-highscore.patch, NONE, 1.1 childsplay.desktop, NONE, 1.1 childsplay.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Thu May 11 13:20:41 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/childsplay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14433/devel
Modified Files:
.cvsignore sources
Added Files:
childsplay-0.81.8-assetml.patch
childsplay-0.81.8-highscore.patch childsplay.desktop
childsplay.spec
Log Message:
auto-import childsplay-0.81.8-2 on branch devel from childsplay-0.81.8-2.src.rpm
childsplay-0.81.8-assetml.patch:
--- NEW FILE childsplay-0.81.8-assetml.patch ---
--- 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
@@ -98,13 +98,13 @@
if DEBUG: print "ChildsplayGoodies",dir(ChildsplayGoodies)
# create two assetmlSDL instances one for parsing images and one for sounds
self.Assets_img = pyassetmlSDL.AssetmlSDL()
- self.Assets_img.set_mldir('childsplay/childsplay-images/childsplay-images.assetml')
+ self.Assets_img.set_mldir('childsplay-images.assetml')
Img.arrow = self.Assets_img.get_assets(('arrow.png',))
# get pictures
- self.Assets_img.set_mldir('childsplay/memory-136x136/memory-136x136.assetml')
+ self.Assets_img.set_mldir('memory-136x136.assetml')
descr_pics = self.Assets_img.get_assets(('*.png',),fullname=1)# {foo.png:foo.png object,spam.png:spam.png object}
- parser = pyassetml.AssetmlParser('childsplay/memory-136x136/memory-136x136.assetml')
+ parser = pyassetml.AssetmlParser('memory-136x136.assetml')
loc = ChildsplayGoodies.language
if DEBUG: print "letters game, locale set to",loc
@@ -124,7 +124,7 @@
if DEBUG: print "Found words",k
self.Assets_snd = pyassetmlSDL.AssetmlSDL()
- self.Assets_snd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml')
+ self.Assets_snd.set_mldir('childsplay-sounds.assetml')
files = ('bummer.wav','wahoo.wav')
self.Assets_snd.get_assets(files, Snd)
childsplay-0.81.8-highscore.patch:
--- NEW FILE childsplay-0.81.8-highscore.patch ---
--- childsplay-0.81.8/CPConstants.py~ 2006-05-05 10:56:38.000000000 +0200
+++ childsplay-0.81.8/CPConstants.py 2006-05-05 10:56:38.000000000 +0200
@@ -21,7 +21,6 @@
MODULESDATADIR = BASEPATH.SHARELIBDATADIR
LOCALEDIR = BASEPATH.LOCALEDIR
ASSETMLROOT = BASEPATH.ASSETMLDIR
-SCOREFILE = BASEPATH.SCOREFILE
CHILDSPLAYRC = BASEPATH.CHILDSPLAYRC
LIBDIR = BASEPATH.LIBDIR
MODULES = BASEPATH.MODULESDIR
@@ -43,6 +42,9 @@
except KeyError,info:
print info
HOMEDIR = os.path.abspath(sys.path[0])
+
+# no sgid support for python, so drop the scorefile in the homedir
+SCOREFILE = os.path.join(HOMEDIR, 'childsplay.score')
# this is the directory tree in HOME_DIR_NAME.
# Names seperated by commas are the names from which directories are created
--- NEW FILE childsplay.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Childsplay
GenericName=Educational games for young children
Comment=Educational and at the same time be fun to play
Exec=childsplay
Icon=childsplay.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;
Version=0.81.8
--- NEW FILE childsplay.spec ---
Name: childsplay
Version: 0.81.8
Release: 2%{?dist}
Summary: Suite of educational games for young children
Group: Amusements/Games
License: GPL
URL: http://childsplay.sourceforge.net/
Source: http://prdownloads.sourceforge.net/childsplay/%{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
%description
Childsplay is a suite of educational games for young children. It's written in
Python and uses the SDL-libraries. The aim is to be educational and at the same
time be fun to play.
Some activities make use of language dependent voice samples, these sounds are
shared with gcompris. For those you'll have to install the gcompris-sound
package for the languages you intend to use. For example gcompris-sound-en .
%prep
%setup -q
%patch0 -p1 -z .highscore
# no backups otherwise the backups endup in the rpm.
%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
rm -r assetml/childsplay/memory-136x136/po
# fixup the python scripts to call python directly and make them executable
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.* .
%build
# INSTALL.sh is seriously borked, so DIY
echo "## Automated file please do not edit" > BASEPATH.py
echo "CPDIR=\"%{_datadir}/%{name}\"" >> BASEPATH.py
echo "SHAREDATADIR=\"%{_datadir}/%{name}/Data\"" >> BASEPATH.py
echo "RCDIR=\"%{_datadir}/%{name}/ConfigData\"" >> BASEPATH.py
echo "SHARELIBDATADIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py
echo "LIBDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py
echo "MODULESDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py
echo "LOCALEDIR=\"%{_datadir}/locale\"" >> BASEPATH.py
echo "ASSETMLDIR=\"%{_datadir}/assetml\"" >> BASEPATH.py
echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py
echo "HOME_DIR_NAME=\".childsplay\"" >> BASEPATH.py
%install
rm -rf $RPM_BUILD_ROOT
# INSTALL.sh is seriously borked, so DIY
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
cp -a *.py $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -s ../share/%{name}/%{name}.py $RPM_BUILD_ROOT%{_bindir}/%{name}
ln -s ../share/%{name}/letters-trans.py \
$RPM_BUILD_ROOT%{_bindir}/letters-trans
cp -a Data $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/%{name}
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*/*.assetml \
$RPM_BUILD_ROOT%{_datadir}/assetml
cp -a locale/* $RPM_BUILD_ROOT%{_datadir}/locale
cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man6
%find_lang %{name}
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 chpl-icon-48.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files -f %{name}.lang
%defattr(-, root, root, -)
%doc README* doc/GPL* doc/README* License_*.ttf.txt
%{_bindir}/%{name}
%{_bindir}/letters-trans
%dir %{_datadir}/childsplay
%{_datadir}/childsplay/*.py
%{_datadir}/childsplay/*.pyc
%ghost %{_datadir}/childsplay/*.pyo
%{_datadir}/childsplay/Data
%{_datadir}/childsplay/childsplay-images
%{_datadir}/childsplay/childsplay-sounds
%{_datadir}/childsplay/memory-136x136
%dir %{_datadir}/childsplay/plugins
%{_datadir}/childsplay/plugins/*.py
%{_datadir}/childsplay/plugins/*.pyc
%ghost %{_datadir}/childsplay/plugins/*.pyo
%{_datadir}/childsplay/plugins/*Data
%{_datadir}/assetml
%{_mandir}/man6/*.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%changelog
* Wed May 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.81.8-2
- Ghost .pyo files
- BR: desktop-file-utils
* Fri May 5 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.81.8-1
- Initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 11 May 2006 13:19:54 -0000 1.1
+++ .cvsignore 11 May 2006 13:20:41 -0000 1.2
@@ -0,0 +1 @@
+childsplay-0.81.8.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 11 May 2006 13:19:54 -0000 1.1
+++ sources 11 May 2006 13:20:41 -0000 1.2
@@ -0,0 +1 @@
+2353509fda8cf7d32c8a10ebd8390370 childsplay-0.81.8.tgz
More information about the fedora-extras-commits
mailing list