- desktop file and icon added

- more explicit paths in BASEPATH.py

Changed files:
    childsplay.spec -> 1.5

diff --git a/childsplay.spec b/childsplay.spec
index b0923cfe311439565d90dd73bb837d69d96ca509..1c71a0b2ce29fcca020403599756b01be9a0684d 100644 (file)
--- a/childsplay.spec
+++ b/childsplay.spec
@@ -11,6 +11,8 @@ Source0:      http://dl.sourceforge.net/childsplay/%{name}-%{version}.tgz
 # Source0-md5: c86a94d6f47047d1cd01b9525629b6dd
 Source1:       http://dl.sourceforge.net/childsplay/%{name}_plugins-%{plugins_ver}.tgz
 # Source1-md5: 48178a23daaa44d01d51bb2246c1541e
+Source2:        %{name}.desktop
+Source3:        %{name}.png
 Patch0:                %{name}-install.patch
 URL:           http://childsplay.sourceforge.net/
 %pyrequires_eq python-modules
@@ -45,17 +47,17 @@ EXECDIR = "%{_bindir}"
 LOCALEDIR = "%{_datadir}/locale"
 ASSETMLDIR = "%{_datadir}/assetml"
 SCOREDIR = "/var/games/"
-SCOREFILE = SCOREDIR + "childsplay.score"
+SCOREFILE = "/var/games/childsplay.score"
 DOCDIR =  "%{_docdir}/childsplay"
 MANDIR = "%{_mandir}/man6"
 CPDIR = "%{_datadir}/childsplay"
-SHAREDIR = CPDIR
+SHAREDIR = "%{_datadir}/childsplay"
 BINDIR = "%{_bindir}/games"
-LIBDIR = CPDIR + "/lib"
-MODULESDIR = LIBDIR
-SHARELIBDATADIR = SHAREDIR + "/lib"
-SHAREDATADIR = SHAREDIR + "/Data"
-RCDIR = SHARELIBDATADIR + "/ConfigData"
+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
@@ -64,11 +66,14 @@ EOF
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_datadir}{/%{name}/lib/{ConfigData,MemoryData},locale,assetml} \
-       $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man6,/var/games}
+        $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir},%{_mandir}/man6,/var/games}
 
 install -Dp childsplay.sh $RPM_BUILD_ROOT%{_bindir}/childsplay
 gzip -dc man/childsplay.6.gz >$RPM_BUILD_ROOT%{_mandir}/man6/childsplay.6
 
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+
 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}
@@ -102,5 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man6/*
 %{_datadir}/%{name}
 %{_datadir}/assetml/*
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.png
 %attr(664,root,games) %config(noreplace) %verify(not md5 mtime size) /var/games/%{name}.score
 %attr(2755,root,games) %{_bindir}/childsplay