rpms/childsplay/FC-5 childsplay.spec, 1.4, 1.5 childsplay-0.81.8-assetml.patch, 1.2, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15249

Modified Files:
	childsplay.spec 
Removed Files:
	childsplay-0.81.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 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



Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-5/childsplay.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- childsplay.spec	27 Aug 2006 12:20:56 -0000	1.4
+++ childsplay.spec	31 Oct 2006 11:08:13 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           childsplay
-Version:        0.83
+Version:        0.84.1
 Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
@@ -8,11 +8,10 @@
 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 @@
 %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 "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 @@
 # 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 @@
   $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,26 +109,24 @@
 %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
+%{_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 <j.w.r.degoede at hhs.nl> 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 <j.w.r.degoede at hhs.nl> 0.83.1-1
+- New upstream release 0.83.1
+
+* 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)
+
 * Sun Aug 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-1
 - New upstream version 0.83
 


--- childsplay-0.81.8-assetml.patch DELETED ---