[mkvtoolnix] update to 7.4.0

[Dominik Mierzejewski]

commit c36c7bacb1b8d315f35ff62644d3e754a18ec8d4
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Wed Dec 17 12:10:48 2014 +0100

    update to 7.4.0
    
    - drop obsolete patch (upstream bug #1090)
    - shorten desktop and icon file installation commands

 .gitignore                          |    1 +
 mkvtoolnix-use-system-pugixml.patch |   45 -----------------------------------
 mkvtoolnix.spec                     |   36 ++++++++++++---------------
 sources                             |    2 +-
 4 files changed, 18 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1ebc58b..6bcff59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /mkvtoolnix-7.0.0.tar.xz
 /mkvtoolnix-7.2.0.tar.xz
 /mkvtoolnix-7.3.0.tar.xz
+/mkvtoolnix-7.4.0.tar.xz
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index 9d95195..d4fc8e5 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -1,12 +1,11 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 7.3.0
+Version: 7.4.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.xz
 Patch0: mkvtoolnix-use-system-boost.patch
-Patch1: mkvtoolnix-use-system-pugixml.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRequires: boost-devel
 BuildRequires: bzip2-devel
@@ -45,7 +44,6 @@ This package contains the graphical interface for these utilities.
 %prep
 %setup -q
 %patch0 -p1 -b .boost
-%patch1 -p1 -b .pugixml
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -53,7 +51,7 @@ for file in AUTHORS ChangeLog ; do
   mv $file.utf $file
 done
 chmod -x src/input/r_flv.{h,cpp}
-rm -rf lib/{boost,pugixml}
+rm -rf lib/boost
 
 %build
 %configure --with-boost-libdir=%{_libdir} --without-curl || cat config.log
@@ -61,22 +59,15 @@ rm -rf lib/{boost,pugixml}
 
 %install
 ./drake DESTDIR=$RPM_BUILD_ROOT TOOLS=1 install
-desktop-file-install \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode=644 \
-  --add-category=GTK \
-  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 \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode=644 \
-  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
+for f in mkvmergeGUI mkvinfo ; do
+  desktop-file-install \
+    --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+    --mode=644 \
+    share/desktop/$f.desktop
+  for size in 32x32 64x64 ; do
+    install -Dpm 644 share/icons/$size/$f.png \
+      $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps/$f.png
+  done
 done
 
 rm -r $RPM_BUILD_ROOT%{_docdir}/mkvtoolnix/guide
@@ -159,6 +150,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/mime/packages/mkvtoolnix.xml
 
 %changelog
+* Wed Dec 17 2014 Dominik Mierzejewski <rpm at greysector.net> 7.4.0-1
+- update to 7.4.0
+- drop obsolete patch (upstream bug #1090)
+- shorten desktop and icon file installation commands
+
 * Thu Dec 04 2014 Dominik Mierzejewski <rpm at greysector.net> 7.3.0-1
 - update to 7.3.0
 - enable unit tests
diff --git a/sources b/sources
index 1066e5b..f03ec49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-190ce613bde843def89a499330ca779b  mkvtoolnix-7.3.0.tar.xz
+d107166920ff0d966ac30626f7cda80d  mkvtoolnix-7.4.0.tar.xz