[mkvtoolnix/f14/master] * Sun Aug 01 2010 Dominik Mierzejewski <rpm at greysector.net> 4.2.0-1 - updated to 4.2.0 (many bugfixe

[Dominik Mierzejewski]

commit bf70455567a89acb9851349cb18d43f626777200
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Wed Aug 4 21:08:46 2010 +0200

    * 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
    - add Dutch manpages
    - process mimeinfo file in scriptlets

 .gitignore      |    2 +-
 mkvtoolnix.spec |   58 ++++++++++++++++++++++++++++++++++++-------------------
 sources         |    2 +-
 3 files changed, 40 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f97f0f..a212046 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-mkvtoolnix-4.0.0.tar.bz2
+mkvtoolnix-4.2.0.tar.bz2
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index 8149f10..5d6ec34 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -1,27 +1,25 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 4.0.0
-Release: 2%{?dist}
+Version: 4.2.0
+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
+BuildRequires: bzip2-devel
 BuildRequires: desktop-file-utils
+BuildRequires: expat-devel
 BuildRequires: file-devel
 BuildRequires: flac-devel
 BuildRequires: gettext
 BuildRequires: libmatroska-devel >= 1.0.0
 BuildRequires: libvorbis-devel
-BuildRequires: pcre-devel
-BuildRequires: zlib-devel
-BuildRequires: expat-devel
 BuildRequires: lzo-devel
-BuildRequires: bzip2-devel
+BuildRequires: pcre-devel
 BuildRequires: wxGTK-devel
+BuildRequires: zlib-devel
 
 %description
 Mkvtoolnix is a set of utilities to mux and demux audio, video and subtitle
@@ -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
 
@@ -80,10 +80,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post gui
 update-desktop-database &>/dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 touch %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun gui
 update-desktop-database &>/dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 touch %{_datadir}/icons/hicolor &>/dev/null || :
 gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -106,6 +108,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 %lang(ja) %{_mandir}/ja/man1/mkvextract*
 %lang(ja) %{_mandir}/ja/man1/mkvmerge*
 %lang(ja) %{_mandir}/ja/man1/mkvpropedit.1*
+%lang(nl) %{_mandir}/nl/man1/mkvextract*
+%lang(nl) %{_mandir}/nl/man1/mkvmerge*
+%lang(nl) %{_mandir}/nl/man1/mkvpropedit.1*
 %lang(zh_CN) %{_mandir}/zh_CN/man1/mkvextract*
 %lang(zh_CN) %{_mandir}/zh_CN/man1/mkvmerge*
 %lang(zh_CN) %{_mandir}/zh_CN/man1/mkvpropedit.1*
@@ -120,14 +125,27 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/mmg*
 %lang(ja) %{_mandir}/ja/man1/mkvinfo*
 %lang(ja) %{_mandir}/ja/man1/mmg*
+%lang(nl) %{_mandir}/nl/man1/mkvinfo*
+%lang(nl) %{_mandir}/nl/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
+%{_datadir}/mime/packages/mkvtoolnix.xml
 
 %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
+- add Dutch manpages
+- process mimeinfo file in scriptlets
+
 * Wed Jul 14 2010 Dan Horák <dan at danny.cz> - 4.0.0-2
 - rebuilt against wxGTK-2.8.11-2
 
diff --git a/sources b/sources
index 223da33..c1527b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-434eb24b9c49a99ac386bd2c4c525538  mkvtoolnix-4.0.0.tar.bz2
+de3e99598d47d0a2226269f79faabbfd  mkvtoolnix-4.2.0.tar.bz2