Author: lisu Date: Sun Jun 13 12:52:55 2010 GMT Module: packages Tag: HEAD ---- Log message: - data files in /usr/share/games/childsplay - more unify paths in setup.py - BR: rpmbuild(macros) >= 1.112 - rel 2
---- Files affected: packages/childsplay: childsplay.spec (1.34 -> 1.35) , pld_setup.py (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/childsplay/childsplay.spec diff -u packages/childsplay/childsplay.spec:1.34 packages/childsplay/childsplay.spec:1.35 --- packages/childsplay/childsplay.spec:1.34 Sat Jun 12 22:15:56 2010 +++ packages/childsplay/childsplay.spec Sun Jun 13 14:52:50 2010 @@ -3,7 +3,7 @@ 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 @@ -14,6 +14,7 @@ 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 @@ -42,7 +43,7 @@ %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 @@ -52,17 +53,17 @@ --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 @@ -73,7 +74,7 @@ %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 @@ -87,6 +88,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.35 2010/06/13 12:52:50 lisu +- data files in /usr/share/games/childsplay +- more unify paths in setup.py +- BR: rpmbuild(macros) >= 1.112 +- rel 2 + Revision 1.34 2010/06/12 20:15:56 lisu - better summary - desc fixes ================================================================ Index: packages/childsplay/pld_setup.py diff -u packages/childsplay/pld_setup.py:1.1 packages/childsplay/pld_setup.py:1.2 --- packages/childsplay/pld_setup.py:1.1 Sat Jun 12 17:40:23 2010 +++ packages/childsplay/pld_setup.py Sun Jun 13 14:52:50 2010 @@ -11,10 +11,10 @@ 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' ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/childsplay/childsplay.spec?r1=1.34&r2=1.35&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/childsplay/pld_setup.py?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
