rpms/childsplay/F-9 childsplay.spec, 1.12, 1.13 sources, 1.8, 1.9 childsplay-0.81.8-highscore.patch, 1.1, NONE

Johan Cwiklinski trasher at fedoraproject.org
Sun Mar 29 16:58:26 UTC 2009


Author: trasher

Update of /cvs/extras/rpms/childsplay/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3049

Modified Files:
	childsplay.spec sources 
Removed Files:
	childsplay-0.81.8-highscore.patch 
Log Message:
Update to childsplay_sp 1.1



Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/F-9/childsplay.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- childsplay.spec	17 Jan 2008 15:10:36 -0000	1.12
+++ childsplay.spec	29 Mar 2009 16:57:55 -0000	1.13
@@ -1,19 +1,38 @@
+%define realname childsplay_sp
+%define alphabet_ver 0.8.5
+
 Name:           childsplay
-Version:        0.90.2
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
 License:        GPLv3
-URL:            http://childsplay.sourceforge.net/
+URL:            http://www.schoolsplay.org/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
 Source1:        childsplay.desktop
-Patch0:         childsplay-0.81.8-highscore.patch
+Source2:        childsplay.README.RPM
+Source10:       alphabet_sounds_ca-0.8.5.tgz
+Source11:       alphabet_sounds_de-0.8.5.tgz
+Source12:       alphabet_sounds_es-0.8.5.tgz
+Source13:       alphabet_sounds_fr-0.8.5.tgz
+Source14:       alphabet_sounds_it-0.8.5.tgz
+Source15:       alphabet_sounds_nl-0.8.5.tgz
+Source16:       alphabet_sounds_ru-0.8.5.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
-Requires:       pygame, childsplay_plugins >= 0.85, hicolor-icon-theme
+Requires:       pygame
+Requires:       python-sqlalchemy
+Requires:       hicolor-icon-theme
 Requires:       pyfribidi
 
+Provides:       childsplay_sp = %{version}-%{release}
+Provides:       childsplay_plugins <= 0.90
+Obsoletes:      childsplay_plugins = %{version}-%{release}
+
+%global python_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+
+
 %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
@@ -24,67 +43,125 @@
 package for the languages you intend to use. For example gcompris-sound-en .
 
 
+%package alphabet_sounds_ca
+Summary:        Catalan alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_ca
+Catalan alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_de
+Summary:        German alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_de
+German alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_es
+Summary:        Spanish alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_es
+Spanish alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_fr
+Summary:        French alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_fr
+French alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_it
+Summary:        Italian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_it
+Italian alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_nl
+Summary:        Dutch alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_nl
+Dutch alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_ru
+Summary:        Russian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_ru
+Russian alphabet sounds for Childsplay
+
+
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16
 # 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
+rm setup.py
+rm `find alphabet_sounds_??-%{alphabet_ver} -name install.py`
+rm -rf 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/logo_cp_*.png Data/childsplay.* .
+sed -i 's!/usr/bin/env python!%{_bindir}/python!' bin/%{name}
+#Fix a typo in the German sounds directory name
+mv alphabet_sounds_de-0.8.5/FlashCardSounds alphabet_sounds_de-0.8.5/FlashCardsSounds
+cp %{SOURCE2} README.RPM
+
 
 %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 "SHARELIBDATADIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py
-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}\"" >> BASEPATH.py
-echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py
-echo "HOME_DIR_NAME=\".childsplay\"" >> BASEPATH.py
+# setup.py is not really usable for our needs
+echo "## Automated file please do not edit" > SPBasePaths.py
+echo "# This module holds all the paths needed for %{name}." >> SPBasePaths.py
+echo "DOCDIR = '%{_datadir}/doc/%{name}-%{version}'" >> SPBasePaths.py
+echo "PYTHONCPDIR = '%{python_sitedir}/%{realname}'" >> SPBasePaths.py
+echo "BASEDIR = '%{_datadir}/%{realname}'" >> SPBasePaths.py
+echo "SHARELIBDATADIR = '%{_datadir}/%{realname}'" >> SPBasePaths.py
+echo "ALPHABETDIR = '%{_datadir}/%{realname}/alphabetsounds'" >> SPBasePaths.py
+echo "LOCALEDIR = '%{_datadir}/locale'" >> SPBasePaths.py
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# INSTALL.sh is seriously borked, so DIY
+# setup.py is not really usable for our needs
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
+mkdir -p $RPM_BUILD_ROOT%{python_sitedir}/%{realname}/lib
 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/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{realname}
+
+cp -a bin/%{name}  $RPM_BUILD_ROOT%{_bindir}
+
+cp -a lib/CPData $RPM_BUILD_ROOT%{_datadir}/%{realname}
+cp -a lib/SPData $RPM_BUILD_ROOT%{_datadir}/%{realname}
+cp -a alphabetsounds $RPM_BUILD_ROOT%{_datadir}/%{realname}
 cp -a locale/* $RPM_BUILD_ROOT%{_datadir}/locale
-cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man6
 
-%find_lang %{name}
+cp -a *.py $RPM_BUILD_ROOT%{python_sitedir}/%{realname}
+cp -a gui $RPM_BUILD_ROOT%{python_sitedir}/%{realname}
+cp -a lib/*.py $RPM_BUILD_ROOT%{python_sitedir}/%{realname}/lib
+cp -a ocempgui $RPM_BUILD_ROOT%{python_sitedir}/%{realname}
+
+%find_lang %{realname}
 
 # 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 \
   %{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 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
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
+install -p -m 644 lib/SPData/menu/default/logo_cp_64x64.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+
+#Alphabet sounds
+for sounds in ca de es fr it nl ru
+do
+  cp -a alphabet_sounds_$sounds-%{alphabet_ver}/AlphabetSounds/$sounds $RPM_BUILD_ROOT%{_datadir}/%{realname}/alphabetsounds
+  cp -a alphabet_sounds_$sounds-%{alphabet_ver}/FlashCardsSounds/$sounds $RPM_BUILD_ROOT%{_datadir}/%{realname}/CPData/FlashcardsData/names
+done
 
 
 %clean
@@ -104,18 +181,86 @@
 fi
 
 
-%files -f %{name}.lang
+%files -f %{realname}.lang
 %defattr(-, root, root, -)
-%doc README* doc/GPL* doc/README* License_*.ttf.txt
+%doc Changelog COPYING doc/* README README.RPM
 %{_bindir}/%{name}
-%{_bindir}/letters-trans
-%{_datadir}/%{name}
-%{_mandir}/man6/*.6.gz
+%dir %{_datadir}/%{realname}
+%{_datadir}/%{realname}/SPData
+%{_datadir}/%{realname}/CPData/*.*
+%{_datadir}/%{realname}/CPData/BilliardData
+%{_datadir}/%{realname}/CPData/FallinglettersData
+%{_datadir}/%{realname}/CPData/FindsoundData
+%{_datadir}/%{realname}/CPData/FishtankData
+%{_datadir}/%{realname}/CPData/FlashcardsData/cards
+%{_datadir}/%{realname}/CPData/FlashcardsData/sounds
+%{_datadir}/%{realname}/CPData/FlashcardsData/names/en
+%{_datadir}/%{realname}/CPData/LMemoryData
+%{_datadir}/%{realname}/CPData/MemoryData
+%{_datadir}/%{realname}/CPData/PackidData
+%{_datadir}/%{realname}/CPData/PongData
+%{_datadir}/%{realname}/CPData/PuzzleData
+%{_datadir}/%{realname}/CPData/SoundmemoryData
+%{_datadir}/%{realname}/alphabetsounds/en
+%{python_sitedir}/%{realname}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
+%files alphabet_sounds_ca
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_ca-%{alphabet_ver}/copyright  alphabet_sounds_ca-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/CPData/FlashcardsData/names/ca
+%{_datadir}/%{realname}/alphabetsounds/ca
+
+
+%files alphabet_sounds_de
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_de-%{alphabet_ver}/copyright  alphabet_sounds_de-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/CPData/FlashcardsData/names/de
+%{_datadir}/%{realname}/alphabetsounds/de
+
+
+%files alphabet_sounds_es
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_es-%{alphabet_ver}/copyright  alphabet_sounds_es-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/CPData/FlashcardsData/names/es
+%{_datadir}/%{realname}/alphabetsounds/es
+
+
+%files alphabet_sounds_fr
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_fr-%{alphabet_ver}/copyright  alphabet_sounds_fr-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/CPData/FlashcardsData/names/fr
+%{_datadir}/%{realname}/alphabetsounds/fr
+
+
+%files alphabet_sounds_it
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_it-%{alphabet_ver}/copyright  alphabet_sounds_it-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/CPData/FlashcardsData/names/it
+%{_datadir}/%{realname}/alphabetsounds/it
+
+
+%files alphabet_sounds_nl
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_nl-%{alphabet_ver}/copyright  alphabet_sounds_nl-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/CPData/FlashcardsData/names/nl
+%{_datadir}/%{realname}/alphabetsounds/nl
+
+
+%files alphabet_sounds_ru
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_ru-%{alphabet_ver}/copyright  alphabet_sounds_ru-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/CPData/FlashcardsData/names/ru
+%{_datadir}/%{realname}/alphabetsounds/ru
+
+
 %changelog
+* Sun Mar 29 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.1-1
+- Upgrade to 1.1
+- Added localized alphabet sounds
+
 * Thu Jan 17 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.90.2-1
 - New upstream version 0.90.2
 - Drop upstreamed replace-cfg patch




--- childsplay-0.81.8-highscore.patch DELETED ---




More information about the fedora-extras-commits mailing list