[zyGrib/f16] Fix maps path, desktop file comment (#751521 #746897)

[Pavel Zhukov]

commit 9d9615b43ae97217d4fb9d7fc3fc12292187a8d1
Author: Pavel Zhukov <pavel at zhukoff.net>
Date:   Mon Nov 7 10:56:30 2011 +0400

    Fix maps path, desktop file comment (#751521 #746897)

 zyGrib-installdata.patch |   13 ++++++++++++-
 zyGrib-paths.patch       |   11 -----------
 zyGrib.desktop           |    2 +-
 zyGrib.spec              |    9 +++------
 4 files changed, 16 insertions(+), 19 deletions(-)
---
diff --git a/zyGrib-installdata.patch b/zyGrib-installdata.patch
index 961df57..ef94e59 100644
--- a/zyGrib-installdata.patch
+++ b/zyGrib-installdata.patch
@@ -54,6 +54,17 @@
 +	static QString pathConfig () {return "/usr/share/zyGrib/data/config/";}
 +	static QString pathFonts ()  {return "/usr/share/zyGrib/data/fonts/";}
 +	static QString pathGis ()    {return "/usr/share/zyGrib/data/gis/";}
- 	static QString pathGshhs ()  {return "/usr/share/zyGrib/maps/gshhs/";}
+ 	static QString pathGshhs ()  {return "maps/gshhs/";}
  	static QString pathStuff ()  {return "stuff/";}
  	
+--- a/src/util/Util.h	2011-11-07 10:39:37.318142013 +0400
++++ b/src/util/Util.h	2011-11-07 10:39:52.993141546 +0400
+@@ -70,7 +70,7 @@
+ 	static QString pathConfig () {return "/usr/share/zyGrib/data/config/";}
+ 	static QString pathFonts ()  {return "/usr/share/zyGrib/data/fonts/";}
+ 	static QString pathGis ()    {return "/usr/share/zyGrib/data/gis/";}
+-	static QString pathGshhs ()  {return "maps/gshhs/";}
++	static QString pathGshhs ()  {return "/usr/share/zyGrib/data/maps/gshhs/";}
+ 	static QString pathStuff ()  {return "stuff/";}
+ 	
+ 	static QString pathImg (const char *fname) {return QString("img/")+fname;}
diff --git a/zyGrib.desktop b/zyGrib.desktop
index a9a7813..208c318 100644
--- a/zyGrib.desktop
+++ b/zyGrib.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=zyGrib
 GenericName=GRIB file viewer
-Comment=Multi-protocol Messaging Client
+Comment=GRIB file viewer
 Exec=zyGrib
 Icon=zyGrib
 Terminal=false
diff --git a/zyGrib.spec b/zyGrib.spec
index 512d000..5996652 100644
--- a/zyGrib.spec
+++ b/zyGrib.spec
@@ -1,6 +1,6 @@
 Name:           zyGrib
 Version:        5.0.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Visualization of meteo data from files in GRIB Format 1 
 Group:          Applications/Internet
 License:        GPLv3+
@@ -13,7 +13,6 @@ Source3:        %{name}.desktop
 Source4:        %{name}.INSTALL
 Patch1:         zyGrib-libs.patch
 # https://bugzilla.redhat.com/733855
-Patch2:         zyGrib-paths.patch
 Patch3:         zyGrib-installdata.patch
 BuildRequires:  bzip2-devel qt4-devel proj-devel desktop-file-utils qwt-devel
 Requires:       qt-x11 proj qwt liberation-fonts-common
@@ -40,7 +39,6 @@ sed -i 's/qmake/qmake-qt4/g' Makefile
 sed -i -e 's:QDir\:\:current():"%{_datadir}\/%{name}\/":' src/util/Settings.cpp
 sed -i -e 's:data/::g' src/util/Util.h src/curvedrawer/CurveDrawerDialog.ui src/Makefile src/zyGrib.pro
 %patch1 -p1
-%patch2 -p1 
 %patch3 -p1
 
 %build
@@ -71,10 +69,9 @@ install -d -m755 %{buildroot}%{_datadir}/applications
 
 
 %changelog
-* Mon Nov 07 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 5.0.4-3
+* Mon Nov 07 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 5.0.6-4
 - New release
-- Fix path (#746896, #746897, #746892)
-
+- Fix path (#746896, #746897, #746892, #746897, #751521)
 
 * Sat Aug 27 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 5.0.4-2
 - Fix maps path (#733855)