- up to 1.5.1

- add custom (hacked) setup.py scirpt (the orginal one was very very unfrendly)
- start clean up this mess
- a lot of changes in this revision, but game is now runable
- nfy

Changed files:
    childsplay.spec -> 1.26

diff --git a/childsplay.spec b/childsplay.spec
index 10c184d008f223380d92a2b1b989e9b2ad66b352..3f503cec982a972532d21d378855d2c9e7e88331 100644 (file)
--- a/childsplay.spec
+++ b/childsplay.spec
@@ -1,25 +1,23 @@
 #
 # TODO:        - enable plugins (if possible)
-#      - check install section
-#      - make it runable :-)
 #
 %define plugins_ver 0.90
 %define plugins_lfc_ver 0.90
 Summary:       Games for children with plugins
 Summary(pl.UTF-8):     Gry dla dzieci z wtyczkami
 Name:          childsplay
-Version:       1.4
-Release:       0.1
+Version:       1.5.1
+Release:       0.5
 License:       GPL v3+
 Group:         X11/Applications/Games
-Source0:       http://dl.sourceforge.net/schoolsplay/%{name}-%{version}.tgz
-# Source0-md5: 80251bd541071ad80419c7671c55b45c
+Source0:       http://downloads.sourceforge.net/schoolsplay/%{name}-%{version}.tgz
+# Source0-md5: 6ed368af17e7e2fd129b0b9c5d4921ec
 #Source1:      http://dl.sourceforge.net/childsplay/%{name}_plugins-%{plugins_ver}.tgz
 # Source1-md5: 2abd77c938ce4297c3a6190637833ca5
 #Source2:      http://dl.sourceforge.net/childsplay/%{name}_plugins_lfc-%{plugins_lfc_ver}.tgz
 # Source2-md5: 123b24a0af50cda07f8c6869d6f939ff
-Source3:        %{name}.desktop
-Patch0:                %{name}-import.patch
+Source3:       %{name}.desktop
+Source4:       pld_setup.py
 URL:           http://www.schoolsplay.org/
 %pyrequires_eq python-modules
 BuildRequires: rpm-pythonprov
@@ -45,47 +43,28 @@ odtwarzanie dźwięku bardzo łatwym.
 %prep
 #%%setup -q -a1 -a2
 %setup -q
-%patch0 -p1
-
-cat <<'EOF' >BASEPATH.py
-BASEPATH = "%{_prefix}"
-EXECDIR = "%{_bindir}"
-LOCALEDIR = "%{_datadir}/locale"
-ASSETMLDIR = "%{_datadir}/assetml"
-SCOREDIR = "/var/games/"
-SCOREFILE = "/var/games/childsplay.score"
-DOCDIR =  "%{_docdir}/childsplay"
-MANDIR = "%{_mandir}/man6"
-CPDIR = "%{_datadir}/childsplay"
-SHAREDIR = "%{_datadir}/childsplay"
-BINDIR = "%{_bindir}"
-LIBDIR = "%{_datadir}/childsplay/lib"
-MODULESDIR = "%{_datadir}/childsplay/lib"
-SHARELIBDATADIR = "%{_datadir}/childsplay/lib"
-SHAREDATADIR = "%{_datadir}/childsplay/Data"
-RCDIR = "%{_datadir}/childsplay/lib/ConfigData"
-CHILDSPLAYRC = "childsplayrc"
-HOME_DIR_NAME = ".childsplayrc"
-EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_datadir}{/%{name}/lib/{ConfigData,MemoryData},locale,assetml} \
-        $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir},%{_mandir}/man6,/var/games}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/alphabetsounds,%{_datadir}/locale,%{py_sitescriptdir}/childsplay_sp}
 
-install -Dp bin/childsplay $RPM_BUILD_ROOT%{_bindir}/childsplay
-#gzip -dc man/childsplay.6.gz >$RPM_BUILD_ROOT%{_mandir}/man6/childsplay.6
+cp -fr lib/CPData $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -fr lib/SPData $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -fr alphabetsounds/en $RPM_BUILD_ROOT%{_datadir}/%{name}/alphabetsounds
+cp -fr locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
-install lib/SPData/menu/default/logo_cp_32x32.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.xpm
+install bin/childsplay $RPM_BUILD_ROOT%{_bindir}
 
-#cp -fr Data/childsplay.score $RPM_BUILD_ROOT/var/games/%{name}.score
-cp -fr *.py $RPM_BUILD_ROOT%{_datadir}/%{name}
-#cp -fr Data/ $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -fr lib $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -fr locale $RPM_BUILD_ROOT%{_datadir}
-#cp -fr assetml $RPM_BUILD_ROOT%{_datadir}
+# use our custom setup.py instead of ugly orginal one
+cp %{SOURCE4} setup.py
+
+%{__python} setup.py install \
+       --optimize=2 \
+       --root=$RPM_BUILD_ROOT
+
+#install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+#install lib/SPData/menu/default/logo_cp_32x32.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.xpm
 
 #cd childsplay_plugins-%{plugins_ver}
 #cp -fr lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
@@ -104,28 +83,19 @@ cp -fr locale $RPM_BUILD_ROOT%{_datadir}
 %py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
 %py_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-find  $RPM_BUILD_ROOT%{_datadir} -maxdepth 2 -name "*.py" | xargs rm
-find  $RPM_BUILD_ROOT%{_datadir}/%{name}/lib -name "*.py[c,o]" | xargs rm
-
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/BASEPATH.py*
-cp BASEPATH.py $RPM_BUILD_ROOT%{_datadir}/%{name}
-
 #mv $RPM_BUILD_ROOT%{_datadir}/locale/{no,nb}
-%find_lang %{name}_sp
+
+%find_lang %{name}_sp --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+#%%files -f %{name}_sp.lang
 %files -f %{name}_sp.lang
-#%%files
 %defattr(644,root,root,755)
 %doc doc/*
-#%%{_mandir}/man6/*
+%attr(755,root,root) %{_bindir}/childsplay
 %{_datadir}/%{name}
-# XXX: shared with gcompris
-#%%dir %{_datadir}/assetml
-#%%{_datadir}/assetml/*
-%{_desktopdir}/%{name}.desktop
-%{_pixmapsdir}/%{name}.xpm
-#%%attr(664,root,games) %config(noreplace) %verify(not md5 mtime size) /var/games/%{name}.score
-%attr(2755,root,games) %{_bindir}/childsplay
+%{py_sitescriptdir}/childsplay_sp
+#%%{_desktopdir}/%{name}.desktop
+#%%{_pixmapsdir}/%{name}.xpm