[mkvtoolnix] - use upstream .desktop files - install 64x64 icons as well - drop vendor from desktop filenames

[Dominik Mierzejewski]

commit df45802ea9c96ccee20aecdad5212bb0c887ba31
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Sun Aug 1 20:43:25 2010 +0200

    - use upstream .desktop files
    - install 64x64 icons as well
    - drop vendor from desktop filenames

 mkvtoolnix.spec |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index 8439bd1..2ead8bc 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -5,8 +5,6 @@ Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
-Source1: mmg.desktop
-Source2: mkvinfo.desktop
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -57,19 +55,21 @@ done
 rm -rf $RPM_BUILD_ROOT
 %{__make} DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true TOOLS=1 install
 desktop-file-install \
-  --vendor=livna \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --mode=644 \
-  %{SOURCE1}
-install -Dpm 644 src/mmg/matroskalogo.xpm \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
+  share/desktop/mkvmergeGUI.desktop
+for size in 32x32 64x64 ; do
+install -Dpm 644 share/icons/$size/mkvmergeGUI.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps/mkvmergeGUI.png
+done
 desktop-file-install \
-  --vendor=livna \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --mode=644 \
-  %{SOURCE2}
-install -Dpm 644 src/info/matroska.xpm \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mkvinfo.xpm
+  share/desktop/mkvinfo.desktop
+for size in 32x32 64x64 ; do
+install -Dpm 644 share/icons/$size/mkvinfo.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps/mkvinfo.png
+done
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/mkvtoolnix/guide
 
@@ -122,16 +122,19 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 %lang(ja) %{_mandir}/ja/man1/mmg*
 %lang(zh_CN) %{_mandir}/zh_CN/man1/mkvinfo*
 %lang(zh_CN) %{_mandir}/zh_CN/man1/mmg*
-%{_datadir}/applications/*-mkvinfo.desktop
-%{_datadir}/applications/*-mmg.desktop
-%{_datadir}/icons/hicolor/32x32/apps/mkvinfo.xpm
-%{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
+%{_datadir}/applications/mkvinfo.desktop
+%{_datadir}/applications/mkvmergeGUI.desktop
+%{_datadir}/icons/hicolor/*/apps/mkvinfo.png
+%{_datadir}/icons/hicolor/*/apps/mkvmergeGUI.png
 
 %changelog
 * Sun Aug 01 2010 Dominik Mierzejewski <rpm at greysector.net> 4.2.0-1
 - updated to 4.2.0 (many bugfixes, see upstream changelog:
   http://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=blob;f=ChangeLog)
 - sorted BRs alphabetically
+- use upstream .desktop files
+- install 64x64 icons as well
+- drop vendor from desktop filenames
 
 * Wed Jul 14 2010 Dan Horák <dan at danny.cz> - 4.0.0-2
 - rebuilt against wxGTK-2.8.11-2