From 08bdab8f8a63e3651c4cd43bffa7e878bbbd02e8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Oct 31 2006 11:15:24 +0000 Subject: - New upstream release 0.84.1 - Install the (still used) assetml files under %{_datadir}/%{name} instead of under %{_datadir}/assetml, since we no longer ship libassetml --- diff --git a/.cvsignore b/.cvsignore index 52e41c3..2b3effa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -childsplay-0.83.1.tgz +childsplay-0.84.1.tgz diff --git a/childsplay-0.81.8-assetml.patch b/childsplay-0.81.8-assetml.patch deleted file mode 100644 index 13fb3ce..0000000 --- a/childsplay-0.81.8-assetml.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- 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 - 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.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 @@ - -- -+ - - Apple - تفاحة ---- 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. -@@ -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: diff --git a/childsplay.spec b/childsplay.spec index 6a51489..d838ec9 100644 --- a/childsplay.spec +++ b/childsplay.spec @@ -1,5 +1,5 @@ Name: childsplay -Version: 0.83.1 +Version: 0.84.1 Release: 1%{?dist} Summary: Suite of educational games for young children Group: Amusements/Games @@ -8,11 +8,10 @@ URL: http://childsplay.sourceforge.net/ 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.83 +Requires: pygame, childsplay_plugins >= 0.84, hicolor-icon-theme %description Childsplay is a suite of educational games for young children. It's written in @@ -27,8 +26,6 @@ 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 @@ -49,7 +46,7 @@ echo "LIBDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py echo "MODULESDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py echo "RCDIR=\"%{_datadir}/%{name}/plugins/ConfigData\"" >> BASEPATH.py echo "LOCALEDIR=\"%{_datadir}/locale\"" >> BASEPATH.py -echo "ASSETMLDIR=\"%{_datadir}/assetml\"" >> BASEPATH.py +echo "ASSETMLDIR=\"%{_datadir}\"" >> BASEPATH.py echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py echo "HOME_DIR_NAME=\".childsplay\"" >> BASEPATH.py @@ -59,7 +56,6 @@ 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} @@ -68,9 +64,7 @@ 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 assetml/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a locale/* $RPM_BUILD_ROOT%{_datadir}/locale cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man6 @@ -115,14 +109,18 @@ fi %doc README* doc/GPL* doc/README* License_*.ttf.txt %{_bindir}/%{name} %{_bindir}/letters-trans -%{_datadir}/childsplay -%{_datadir}/assetml +%{_datadir}/%{name} %{_mandir}/man6/*.6.gz %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Tue Oct 31 2006 Hans de Goede 0.84.1-1 +- New upstream release 0.84.1 +- Install the (still used) assetml files under %%{_datadir}/%%{name} instead + of under %%{_datadir}/assetml, since we no longer ship libassetml + * Fri Sep 22 2006 Hans de Goede 0.83.1-1 - New upstream release 0.83.1 diff --git a/sources b/sources index 621d0aa..0900750 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bdcd090f0adcd992c62a60ef39819e14 childsplay-0.83.1.tgz +ae4e26a361b12d88b2d597a57568ac5e childsplay-0.84.1.tgz