packages: childsplay/childsplay.spec - restore icon and desktop - run setup...

[lisu]

Author: lisu                         Date: Sat Jun 12 19:42:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restore icon and desktop
- run setup.py first, then install rest files

---- Files affected:
packages/childsplay:
   childsplay.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: packages/childsplay/childsplay.spec
diff -u packages/childsplay/childsplay.spec:1.29 packages/childsplay/childsplay.spec:1.30
--- packages/childsplay/childsplay.spec:1.29	Sat Jun 12 21:12:52 2010
+++ packages/childsplay/childsplay.spec	Sat Jun 12 21:42:25 2010
@@ -45,14 +45,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/alphabetsounds,%{_datadir}/locale,%{py_sitescriptdir}/childsplay_sp}
-
-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 bin/childsplay $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/{%{name}/alphabetsounds,locale},%{_pixmapsdir},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT%{py_sitescriptdir}/childsplay_sp
 
 # use our custom setup.py instead of ugly orginal one
 cp %{SOURCE2} setup.py
@@ -61,8 +55,14 @@
 	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
 
-#install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-#install lib/SPData/menu/default/logo_cp_32x32.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.xpm
+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 %{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}
@@ -80,8 +80,8 @@
 %attr(755,root,root) %{_bindir}/childsplay
 %{_datadir}/%{name}
 %{py_sitescriptdir}/childsplay_sp
-#%%{_desktopdir}/%{name}.desktop
-#%%{_pixmapsdir}/%{name}.xpm
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -89,6 +89,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2010/06/12 19:42:25  lisu
+- restore icon and desktop
+- run setup.py first, then install rest files
+
 Revision 1.29  2010/06/12 19:12:52  lisu
 - plugins are not supported anymore
 - more cleanups
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/childsplay/childsplay.spec?r1=1.29&r2=1.30&f=u