Fix icon installation destinations.
authorAlexander Koenig <alex@lisas.de>
Thu, 6 Feb 2014 22:42:00 +0000 (23:42 +0100)
committerAlexander Koenig <alex@lisas.de>
Thu, 6 Feb 2014 22:42:00 +0000 (23:42 +0100)
icons/Makefile.am
terminatorX.keys.in
terminatorX.spec.in

index f9dc85ead5027ea83eeb48708373e8f70ebaec62..1577989429333ab6f9ba5bb8e652e7b13bc10e63 100644 (file)
@@ -1,20 +1,22 @@
 themedir = $(datadir)/icons/hicolor
 size = 48x48
-context = apps
+apps_context = apps
+mime_context = mimetypes
 
-iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = \
-       terminatorX.png\
-       terminatorX-mime.png
+mimeiconsdir = $(themedir)/$(size)/$(mime_context)
+mimeicons_DATA = \
+        terminatorX-mime.png
+
+appiconsdir = $(themedir)/$(size)/$(apps_context)
+appicons_DATA = \
+       terminatorX.png
 
 pixmapsdir = $(datadir)/pixmaps
 pixmaps_DATA = \
-        terminatorX.png\
-       terminatorX.xpm\
-        terminatorX-mime.png
-
+       terminatorX.xpm
 
 EXTRA_DIST = \
-       $(icons_DATA)\
+       $(mimeicons_DATA)\
+       $(appicons_DATA)\
        $(pixmaps_DATA)
index 4bd3304640d0bde5138dc4b9f36a988b238352a1..31afd846c3db3b4a64a46c59030b77e1398f58b5 100644 (file)
@@ -2,4 +2,4 @@ application/x-terminatorX:
        open=terminatorX %f
        view=terminatorX %f
        edit=terminatorX %f
-       icon-filename=@prefix@/share/pixmaps/terminatorX-mime.png
+       icon-filename=@prefix@/icons/hicolor/48x48/mimetypes/terminatorX-mime.png
index dbc04d54f4386475eb6dd2dd28e53759ff808d46..4bbb946a0aca433546f9a75e68ebb4a0c01fa0f5 100644 (file)
@@ -1,7 +1,7 @@
 Summary:       Real-time Audio Synthesizer
-Name:          %{name}
-Version:       %{version}
-Release:       %{release}%{?dist}
+Name:          @PACKAGE_NAME@  
+Version:       @VERSION@
+Release:       1%{?dist}
 Group:         Applications/Multimedia
 License:       GPLv2+ and GFDL
 URL:           http://terminatorX.org
@@ -86,7 +86,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/mime-info/%{name}.keys
 %{_datadir}/mime-info/%{name}.mime
 %{_datadir}/omf/*/*
+%{_datadir}/pixmaps/*xpm
 %{_datadir}/icons/hicolor/48x48/apps/*png
+%{_datadir}/icons/hicolor/48x48/mimetypes/*png
 %{_datadir}/applications/%{name}.desktop
 
 %changelog