rpms/childsplay_plugins/devel childsplay_plugins-0.80.7-alphabet-sounds.patch, NONE, 1.1 childsplay_plugins.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 18:18:47 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/childsplay_plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30825/devel
Modified Files:
.cvsignore sources
Added Files:
childsplay_plugins-0.80.7-alphabet-sounds.patch
childsplay_plugins.spec
Log Message:
auto-import childsplay_plugins-0.80.7-3 on branch devel from childsplay_plugins-0.80.7-3.src.rpm
childsplay_plugins-0.80.7-alphabet-sounds.patch:
--- NEW FILE childsplay_plugins-0.80.7-alphabet-sounds.patch ---
--- childsplay_plugins-0.80.7/lib/findsound2.py.alphabet 2006-04-09 11:12:39.000000000 +0200
+++ childsplay_plugins-0.80.7/lib/findsound2.py 2006-05-05 20:16:56.000000000 +0200
@@ -97,10 +97,10 @@
def _setup(self):
""" Set all the stuff we need"""
#self.sounddir = os.path.join(self.libdir,'Findsound2Data',get_locale()[:2])
- if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
- self.sounddir = os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
+ if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
+ self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
if not os.path.exists(self.sounddir):
- self.sounddir = os.path.join(DATADIR,'AlphabetSounds','en')
+ self.sounddir = '/usr/share/gcompris/boards/sounds/en/alphabet'
img = load_image(os.path.join\
(self.libdir,'Findsound2Data','Data','soundbut.png'),1)
@@ -127,7 +127,10 @@
else:
fsize = 88
img = char2surf(c,fsize,(255,0,0))
- snd = os.path.join(snddir,c.lower()+'.ogg')
+ if c == '10':
+ snd = os.path.join(snddir, c.lower()+'.ogg')
+ else:
+ snd = os.path.join(snddir, 'U%04X.ogg'%ord(c.lower()))
if _FSDEBUG: print "char,snd",c.lower(),snd
objects.append(ImageObject(img,snd))
if _FSDEBUG: print "objects",objects
--- childsplay_plugins-0.80.7/lib/packid.py.alphabet 2006-04-09 11:12:39.000000000 +0200
+++ childsplay_plugins-0.80.7/lib/packid.py 2006-05-05 20:15:26.000000000 +0200
@@ -473,7 +473,7 @@
# Look for alphabet sounds for this locale.
# If all fails we fall back to the "old" wahoo sound.
- alphabetdir = os.path.join(DATADIR,'AlphabetSounds',wordsloc)
+ alphabetdir = os.path.join('/usr/share/gcompris/boards/sounds',wordsloc,'alphabet')
if not os.path.exists(alphabetdir):
print >> sys.stderr, "Can't find",alphabetdir
alphabetdir = None
@@ -741,7 +741,7 @@
pygame.display.update(self.screen.blit(Img.pac_smile,self.packid.rect))
if self.alphabetdir:
try:
- char = obj.char.lower()+'.ogg'
+ char = 'U%04X.ogg' % ord(obj.char.lower())
pygame.time.wait(500)
load_music(os.path.join(self.alphabetdir,char)).play()
except Exception,info:
--- NEW FILE childsplay_plugins.spec ---
Name: childsplay_plugins
Version: 0.80.7
Release: 3%{?dist}
Summary: Plugins for childsplay (educational games for young children)
Group: Amusements/Games
License: GPL
URL: http://childsplay.sourceforge.net/
Source: http://download.sourceforge.net/childsplay/%{name}-%{version}.tgz
Patch0: childsplay_plugins-0.80.7-alphabet-sounds.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: childsplay >= 0.81.4
%description
Plugins (games) for Childsplay a suite of educational games for young
children. The aim is to be educational and at the same time be fun to play.
%prep
%setup -q
# no backups otherwise the backups endup in the rpm.
%patch0 -p1
# the translation is merged into the assetml file, so don't ship it seperatly
rm -r assetml/childsplay/sounds-misc/po
%build
# Only python code, no so nothing to build.
%install
rm -rf $RPM_BUILD_ROOT
# INSTALL.sh is seriously borked, so DIY
mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
cp -a Data/*.icon.png $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/childsplay
mv $RPM_BUILD_ROOT%{_datadir}/childsplay/*/*.assetml \
$RPM_BUILD_ROOT%{_datadir}/assetml
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root, -)
%doc README*
%dir %{_datadir}/childsplay
%dir %{_datadir}/childsplay/plugins
%{_datadir}/childsplay/plugins/*.py
%{_datadir}/childsplay/plugins/*.pyc
%ghost %{_datadir}/childsplay/plugins/*.pyo
%{_datadir}/childsplay/plugins/*Data
%{_datadir}/childsplay/plugins/SoundMemory
%{_datadir}/childsplay/Data
%{_datadir}/childsplay/sounds-misc
%{_datadir}/assetml/*
%changelog
* Thu May 11 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.80.7-3
- Own /usr/share/childsplay and subdirs to guarantee correct uninstall
(bz 190878).
- Fix Source0 to point to the main sourceforge download instead of to the
mirror selection page.
* Wed May 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.80.7-2
- Ghost .pyo files
- Don't create backups for the alphabet patch, the backups end up getting
installed
* Fri May 5 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.80.7-1
- Initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 11 May 2006 18:17:58 -0000 1.1
+++ .cvsignore 11 May 2006 18:18:46 -0000 1.2
@@ -0,0 +1 @@
+childsplay_plugins-0.80.7.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 11 May 2006 18:17:58 -0000 1.1
+++ sources 11 May 2006 18:18:46 -0000 1.2
@@ -0,0 +1 @@
+d3ea05d2a1fb373d9c4836845b199a76 childsplay_plugins-0.80.7.tgz
More information about the fedora-extras-commits
mailing list