[mkvtoolnix] Update to 5.5.0

[Nicolas Chauvet]

commit 1e23103a94e935f05fa3717cf18d6825f5820c57
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Sun Apr 22 23:33:52 2012 +0200

    Update to 5.5.0

 .gitignore                      |    1 +
 mkvinfo.desktop                 |   10 ----------
 mkvtoolnix-5.5.0-backport.patch |   32 ++++++++++++++++++++++++++++++++
 mkvtoolnix.spec                 |   14 ++++++++++----
 mmg.desktop                     |    9 ---------
 sources                         |    2 +-
 6 files changed, 44 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eac4b69..b876ad2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /mkvtoolnix-4.9.1.tar.bz2
 /mkvtoolnix-5.0.1.tar.bz2
 /mkvtoolnix-5.2.1.tar.bz2
+/mkvtoolnix-5.5.0.tar.bz2
diff --git a/mkvtoolnix-5.5.0-backport.patch b/mkvtoolnix-5.5.0-backport.patch
new file mode 100644
index 0000000..00e3b36
--- /dev/null
+++ b/mkvtoolnix-5.5.0-backport.patch
@@ -0,0 +1,32 @@
+commit c42c8f1881a6740e0ee1bfd5cdf7fb667ec25d2e
+Author: Moritz Bunkus <moritz at bunkus.org>
+Date:   Tue Apr 10 21:04:17 2012 +0200
+
+    Fix compilation error & warning
+
+diff --git a/src/tools/base64tool.cpp b/src/tools/base64tool.cpp
+index 069be30..100b23c 100644
+--- a/src/tools/base64tool.cpp
++++ b/src/tools/base64tool.cpp
+@@ -75,7 +75,7 @@ main(int argc,
+   try {
+     in = mm_io_cptr(new mm_file_io_c(argv[2]));
+     if (mode != 'e')
+-      intext = mm_io_cptr(new mm_text_io_c(in.get_object(), false));
++      intext = mm_io_cptr(new mm_text_io_c(in.get(), false));
+   } catch(...) {
+     mxerror(boost::format(Y("The file '%1%' could not be opened for reading (%2%, %3%).\n")) % argv[2] % errno % strerror(errno));
+   }
+diff --git a/src/tools/ebml_validator.cpp b/src/tools/ebml_validator.cpp
+index 72b0739..449c139 100644
+--- a/src/tools/ebml_validator.cpp
++++ b/src/tools/ebml_validator.cpp
+@@ -271,7 +271,7 @@ read_size(int64_t end_pos) {
+ static void
+ parse_content(int level,
+               int64_t end_pos) {
+-  while (g_in->getFilePointer() < end_pos) {
++  while (static_cast<int64_t>(g_in->getFilePointer()) < end_pos) {
+     int64_t element_start_pos = g_in->getFilePointer();
+ 
+     try {
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index aa01839..0a8c704 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -1,10 +1,11 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 5.2.1
-Release: 3%{?dist}
+Version: 5.5.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
+Patch0: mkvtoolnix-5.5.0-backport.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -42,6 +43,7 @@ This package contains the graphical interface for these utilities.
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -130,17 +132,21 @@ 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(uk) %{_mandir}/uk/man1/mkvinfo*
+%lang(uk) %{_mandir}/uk/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/mkvmergeGUI.desktop
-%{_datadir}/icons/hicolor/*/apps/mkvinfo.png
-%{_datadir}/icons/hicolor/*/apps/mkvmergeGUI.png
+%{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/mime/packages/mkvtoolnix.xml
 
 %changelog
+* Sun Apr 22 2012 Nicolas Chauvet <kwizart at gmail.com> - 5.5.0-1
+- Update to 5.5.0
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.1-3
 - Rebuilt for c++ ABI breakage
 
diff --git a/sources b/sources
index 2743a8c..22a5dab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4942dc6427935838e914b8b7b83021a  mkvtoolnix-5.2.1.tar.bz2
+2c89693b2a2391ece14a5c93ba8a9974  mkvtoolnix-5.5.0.tar.bz2