rpms/childsplay_plugins/FC-6 childsplay_plugins-0.80.7-alphabet-sounds.patch, 1.1, 1.2 childsplay_plugins.spec, 1.4, 1.5 childsplay_plugins-0.80.8-assetml.patch, 1.2, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15074

Modified Files:
	childsplay_plugins-0.80.7-alphabet-sounds.patch 
	childsplay_plugins.spec 
Removed Files:
	childsplay_plugins-0.80.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml


childsplay_plugins-0.80.7-alphabet-sounds.patch:

Index: childsplay_plugins-0.80.7-alphabet-sounds.patch
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-6/childsplay_plugins-0.80.7-alphabet-sounds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- childsplay_plugins-0.80.7-alphabet-sounds.patch	11 May 2006 18:18:46 -0000	1.1
+++ childsplay_plugins-0.80.7-alphabet-sounds.patch	31 Oct 2006 11:07:02 -0000	1.2
@@ -4,10 +4,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 _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
+-        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
++        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
++        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.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'


Index: childsplay_plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-6/childsplay_plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- childsplay_plugins.spec	6 Sep 2006 14:05:45 -0000	1.4
+++ childsplay_plugins.spec	31 Oct 2006 11:07:02 -0000	1.5
@@ -1,16 +1,15 @@
 Name:           childsplay_plugins
-Version:        0.83
-Release:        2%{?dist}
+Version:        0.84
+Release:        1%{?dist}
 Summary:        Plugins for childsplay (educational games for young children)
 Group:          Amusements/Games
 License:        GPL
 URL:            http://childsplay.sourceforge.net/
 Source:         http://dl.sf.net/sourceforge/childsplay/%{name}-%{version}.tgz
 Patch0:         childsplay_plugins-0.80.7-alphabet-sounds.patch
-Patch1:         childsplay_plugins-0.80.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       childsplay >= 0.83
+Requires:       childsplay >= 0.84
 
 %description
 Plugins (games) for Childsplay a suite of educational games for young
@@ -21,7 +20,6 @@
 %setup -q
 # no backups otherwise the backups endup in the rpm.
 %patch0 -p1
-%patch1 -p1
 # the translation is merged into the assetml file, so don't ship it seperatly
 rm -r assetml/childsplay/sounds-misc/po
 
@@ -35,12 +33,9 @@
 # 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
@@ -51,10 +46,14 @@
 %defattr(-, root, root, -)
 %doc README*
 %{_datadir}/childsplay
-%{_datadir}/assetml
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
+- New upstream release 0.84
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
 * Wed Sep  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-2
 - Don't %%ghost the .pyo files (bug 205370)
 


--- childsplay_plugins-0.80.8-assetml.patch DELETED ---