[gvrng/f17] Resolves: bz895719 859720

[Neil Horman]

commit 6794617cb4ed18280eaa2e39a76f1b64bc793ad8
Author: Neil Horman <nhorman at tuxdriver.com>
Date:   Wed Jan 16 14:11:16 2013 -0500

    Resolves: bz895719 859720

 gvrng.desktop |    1 +
 gvrng.spec    |   18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/gvrng.desktop b/gvrng.desktop
index eb19d84..15cadbd 100644
--- a/gvrng.desktop
+++ b/gvrng.desktop
@@ -4,4 +4,5 @@ Comment=Kids Programming Tutor
 Exec=/usr/bin/gvrng
 Terminal=false
 Type=Application
+Icon=gvrng
 Categories=Game
diff --git a/gvrng.spec b/gvrng.spec
index ad21b80..0301efd 100644
--- a/gvrng.spec
+++ b/gvrng.spec
@@ -1,6 +1,6 @@
 Name: gvrng		
 Version: 4.4	
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A robot driving game designed to introduce to kids to programming	
 
 Group: Amusements/Games
@@ -13,7 +13,7 @@ Source2: gvrng.desktop
 BuildArch: noarch
 BuildRequires: python2-devel gettext desktop-file-utils
 
-Requires: pygtk2-libglade
+Requires: pygtk2-libglade pygtksourceview
 
 Patch0: gvrng-py-exec.patch
 Patch1: gvrng-licence-format.patch
@@ -36,6 +36,9 @@ mkdir -p %{buildroot}/%{_mandir}/man1/
 mkdir -p %{buildroot}/usr/share/doc/gvrng
 mkdir -p %{buildroot}%{_datadir}/gvrng
 mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}%{_datadir}/applications/
+mkdir -p %{buildroot}/%{_datadir}/pixmaps/
+
 cp -r ./* %{buildroot}/%{python_sitelib}/GvRng_4.4
 mv %{buildroot}%{python_sitelib}/GvRng_4.4 %{buildroot}%{python_sitelib}/gvrng
 mv %{buildroot}%{python_sitelib}/gvrng/docs/gvrng.1.gz %{buildroot}%{_mandir}/man1/
@@ -47,7 +50,9 @@ mv %{buildroot}%{python_sitelib}/gvrng/Changelog %{buildroot}/usr/share/doc/gvrn
 mv %{buildroot}%{python_sitelib}/gvrng/copyright %{buildroot}/usr/share/doc/gvrng
 mv %{buildroot}%{python_sitelib}/gvrng/GPL-2 %{buildroot}/usr/share/doc/gvrng
 install -m 0755 %{SOURCE1} %{buildroot}/%{_bindir}
-desktop-file-install --dir=%{buildroot}%{_datadir}/gvrng/ %{SOURCE2}
+convert -size 48x48 ./bitmaps/robot.svg \
+                    %{buildroot}/%{_datadir}/pixmaps/gvrng.png
+desktop-file-install --dir=%{buildroot}/%{_datadir}/applications/ %{SOURCE2}
 %find_lang %{name}
 
 %files -f %{name}.lang
@@ -55,11 +60,16 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/gvrng/ %{SOURCE2}
 %{python_sitelib}/gvrng/*
 %doc %{_docdir}/gvrng
 %dir %{_datadir}/gvrng
-%{_datadir}/gvrng/gvrng.desktop
+%{_datadir}/applications/*
+%{_datadir}/pixmaps/*
 %{_mandir}/man1/*
 %{_bindir}/*
 
 %changelog
+* Wed Jan 16 2013 Neil Horman <nhorman at tuxdriver.com. - 4.4-4
+- Fixed pygtksourceview dep (bz895719)
+- Fixed desktop-file install issue (bz895720)
+
 * Thu Dec 26 2012 Neil Horman <nhorman at tuxdriver.com> - 4.4-3
 - Removed clean section (no epel packaging)
 - Removed redundant python2 Requires