Fix icon target dir

Uses icon path recommended by Freedesktop.

Submitted by Stanislav Brabec

diff --git a/ChangeLog b/ChangeLog
index 3c9effb7a278bb936358ce341109f26bc0e29a9b..106586cbc7c82027f3f2cde977cf215606ca70ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Stanislav Brabec <sbrabec@users.sourceforge.net>
        * Rename icon: viking_icon.png -> viking.png
        * Fix missing files in po/POTFILES.in
        * src/viking.desktop.in: add GenericName and revise Categories
+       * viking.spec.in, src/icons/Makefile.am: Fix icon target dir
 
 2008-09-22
 Quy Tonthat <qtonthat@gmail.com>:

diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am
index 76dc8295366f35a6067e14a3169515e629ca1444..d2d927f7c4d3055b9e64f235bfaf2988299605ba 100644 (file)
--- a/src/icons/Makefile.am
+++ b/src/icons/Makefile.am
@@ -149,5 +149,15 @@ $(BUILT_SOURCES): $(srcdir)/Makefile.am
 INCLUDES        = @GTK_CFLAGS@
 AM_CFLAGS       = -Wall -g -D_GNU_SOURCE
 
-iconsdir = $(datadir)/icons
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA = viking.png
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+       @-if test -z "$(DESTDIR)"; then \
+               echo "Updating Gtk icon cache."; \
+               $(gtk_update_icon_cache); \
+       else \
+               echo "*** Icon cache not updated.  After install, run this:"; \
+               echo "***   $(gtk_update_icon_cache)"; \
+       fi

diff --git a/viking.spec.in b/viking.spec.in
index 209fb1eaff9c2afe9ed632ffe0463760fab61eeb..5a12200ca348d340bb811bcaac175a073851e08d 100644 (file)
--- a/viking.spec.in
+++ b/viking.spec.in
@@ -20,6 +20,8 @@ BuildRequires:        gtk2-devel >= 2.2.0
 BuildRequires: pkgconfig
 BuildRequires: gpsd-devel
 BuildRequires: gettext perl(XML::Parser)
+BuildRequires: intltool
+BuildRequires: libxslt
 
 %description
 Viking is a free/open source program to manage GPS data. You can import and
@@ -52,6 +54,8 @@ rm -rf %{buildroot}
 %doc AUTHORS ChangeLog COPYING NEWS README TODO doc/
 %{_bindir}/viking
 %{_bindir}/viking-remote
+%{_datadir}/applications/viking.desktop
+%{_datadir}/icons/hicolor/48x48/apps/viking.png
 
 %changelog
 * Thu Feb 21 2008 Michael A. Peters <mpeters@mac.com> - 0.9.3.20080220-1