- data files in /usr/share/games/childsplay

- more unify paths in setup.py
- BR: rpmbuild(macros) >= 1.112
- rel 2

Changed files:
    childsplay.spec -> 1.35
    pld_setup.py -> 1.2

diff --git a/childsplay.spec b/childsplay.spec
index 7d806636d0ebada41b4ef1839ed81cd3a6f154d2..1b10d0dc00d03323f03fd939d55cb2f9afcc71d5 100644 (file)
--- a/childsplay.spec
+++ b/childsplay.spec
@@ -2,7 +2,7 @@ Summary:        Educational games for children
 Summary(pl.UTF-8):     Gry edukacyjne dla dzieci
 Name:          childsplay
 Version:       1.5.1
-Release:       1
+Release:       2
 License:       GPL v3+
 Group:         X11/Applications/Games
 Source0:       http://downloads.sourceforge.net/schoolsplay/%{name}-%{version}.tgz
@@ -13,6 +13,7 @@ Patch0:               %{name}-gettext.patch
 URL:           http://www.schoolsplay.org/
 BuildRequires: python-devel
 BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.112
 %pyrequires_eq python-modules
 Requires:      python-SQLAlchemy
 Requires:      python-numpy
@@ -41,7 +42,7 @@ animacje płynnymi i odtwarzanie dźwięku bardzo łatwym.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/{%{name}/alphabetsounds,locale},%{_pixmapsdir},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/{games/%{name}/alphabetsounds,locale},%{_pixmapsdir},%{_desktopdir}}
 install -d $RPM_BUILD_ROOT%{py_sitescriptdir}/childsplay_sp
 
 # use our custom setup.py instead of ugly orginal one
@@ -51,17 +52,17 @@ cp %{SOURCE2} setup.py
        --optimize=2 \
        --root=$RPM_BUILD_ROOT
 
-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 lib/CPData $RPM_BUILD_ROOT%{_datadir}/games/%{name}
+cp -fr lib/SPData $RPM_BUILD_ROOT%{_datadir}/games/%{name}
+cp -fr alphabetsounds/en $RPM_BUILD_ROOT%{_datadir}/games/%{name}/alphabetsounds
 cp -fr locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install bin/childsplay $RPM_BUILD_ROOT%{_bindir}
 install lib/SPData/menu/default/logo_cp_64x64.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
-%py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
-%py_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name}
+%py_comp $RPM_BUILD_ROOT%{_datadir}/games/%{name}
+%py_ocomp $RPM_BUILD_ROOT%{_datadir}/games/%{name}
 
 %find_lang %{name}_sp --all-name
 
@@ -72,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc/*
 %attr(755,root,root) %{_bindir}/childsplay
-%{_datadir}/%{name}
+%{_datadir}/games/%{name}
 %{py_sitescriptdir}/childsplay_sp
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.png

diff --git a/pld_setup.py b/pld_setup.py
index 6fed110f1081b8a5278539f3e3a421c49c805ea5..1250c99cad7adf6bf90d24d7287a5163a9a0c035 100644 (file)
--- a/pld_setup.py
+++ b/pld_setup.py
@@ -11,10 +11,10 @@ import os, glob, shutil
 
 PREFIX = '/usr'
 
-modulepaths = {'ALPHABETDIR':os.path.join(PREFIX, 'share', 'childsplay', 'alphabetsounds')}
+modulepaths = {'ALPHABETDIR':os.path.join(PREFIX, 'share', 'games', 'childsplay', 'alphabetsounds')}
 modulepaths['BASEDIR'] = os.path.join(PREFIX, 'childsplay_sp')
-modulepaths['SHARELIBDATADIR'] = "/usr/share/childsplay"
-modulepaths['LOCALEDIR'] = "/usr/share/locale"
+modulepaths['SHARELIBDATADIR'] = os.path.join(PREFIX, 'share', 'games', 'childsplay')
+modulepaths['LOCALEDIR'] = os.path.join(PREFIX, 'share', 'locale')
 modulepaths['PYTHONCPDIR'] = os.path.join(get_python_lib(), 'childsplay_sp')
 
 module = 'SPBasePaths.py'