- up to 4.2.0

Changed files:
    mkvtoolnix-init_locales.patch -> 1.3
    mkvtoolnix.spec -> 1.35

diff --git a/mkvtoolnix-init_locales.patch b/mkvtoolnix-init_locales.patch
index 9bff4fce2440a6994e45d29bdf72bf58ef49765d..fad38c88041565c5cb49d16b7c837592c6d5c950 100644 (file)
--- a/mkvtoolnix-init_locales.patch
+++ b/mkvtoolnix-init_locales.patch
@@ -9,31 +9,3 @@
  
    locale_dir = MTX_LOCALE_DIR;
  # endif  // SYS_WINDOWS
---- mkvtoolnix-2.9.7/src/mmg/options/mmg.cpp.orig      2009-07-01 18:40:03.000000000 +0200
-+++ mkvtoolnix-2.9.7/src/mmg/options/mmg.cpp   2009-07-05 19:50:07.000000000 +0200
-@@ -163,8 +163,9 @@
-   siz_all->Add(new wxStaticLine(this),                             0, wxGROW | wxLEFT | wxRIGHT, 5);
-   siz_all->AddSpacer(5);
- 
-+  wxBoxSizer *siz_line;
- #if defined(HAVE_LIBINTL_H)
--  wxBoxSizer *siz_line = new wxBoxSizer(wxHORIZONTAL);
-+  siz_line = new wxBoxSizer(wxHORIZONTAL);
-   siz_line->Add(st_ui_language, 0, wxALIGN_CENTER_VERTICAL);
-   siz_line->Add(cob_ui_language, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 5);
- 
---- mkvtoolnix-2.9.7/src/mmg/options/mmg.cpp.orig      2009-07-05 19:51:07.000000000 +0200
-+++ mkvtoolnix-2.9.7/src/mmg/options/mmg.cpp   2009-07-05 19:59:06.000000000 +0200
-@@ -248,10 +248,12 @@
-   b_browse_output_directory->Enable(enable && odm_is_fixed);
- }
- 
-+#if defined(HAVE_LIBINTL_H)
- std::string
- optdlg_mmg_tab::get_selected_ui_language() {
-   return m_sorted_locales[cob_ui_language->GetSelection()];
- }
-+#endif  // HAVE_LIBINTL_H
- 
- void
- optdlg_mmg_tab::save_options() {

diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index b64ead6f4357d7cfcfa100a1b91dae5f314e023b..d2dd2421835bf7130723406483d79fa5132e7b3f 100644 (file)
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -1,5 +1,6 @@
 # TODO:
 # - make -gui subpackages (wxWidgets and Qt4 deps)
+# - boost autodetection fails ($BOOSTLIBDIR empty), so all boost libs must be passed --with-boost-xxx=xxxx
 #
 # Conditional build
 %bcond_with    verbose # verbose build (V=1)
@@ -9,12 +10,12 @@
 Summary:       Matroska video utilities
 Summary(pl.UTF-8):     Narzędzia do filmów w formacie Matroska
 Name:          mkvtoolnix
-Version:       3.2.0
+Version:       4.2.0
 Release:       1
 License:       GPL v2
 Group:         Applications/Multimedia
 Source0:       http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
-# Source0-md5: 9bf31280cb07870771e69de0287dc769
+# Source0-md5: de3e99598d47d0a2226269f79faabbfd
 Patch0:                %{name}-init_locales.patch
 URL:           http://www.bunkus.org/videotools/mkvtoolnix/
 %{?with_qt:BuildRequires:      QtGui-devel}
@@ -55,6 +56,7 @@ Narzędzia do filmów w formacie Matroska.
        --%{?with_qt:en}%{!?with_qt:dis}able-qt \
        --with-boost-filesystem=boost_filesystem \
        --with-boost-regex=boost_regex \
+       --with-boost-system=boost_system \
        %{?with_qt:--with-moc=/usr/bin/moc-qt4} \
        %{?with_qt:--with-uic=/usr/bin/uic-qt4} \
        %{?with_wx:--with-wx-config=/usr/bin/wx-gtk2-unicode-config}
@@ -66,6 +68,7 @@ Narzędzia do filmów w formacie Matroska.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+       INSTALL="install -cp" \
        DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
@@ -81,6 +84,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}/guide
 %{_datadir}/%{name}/guide/en
 %lang(zh_CN) %{_datadir}/%{name}/guide/zh_CN
+%{_datadir}/mime/packages/mkvtoolnix.xml
+%{_desktopdir}/mkvinfo.desktop
+%{_desktopdir}/mkvmergeGUI.desktop
+%{_iconsdir}/hicolor/*/apps/mkvinfo.png
+%{_iconsdir}/hicolor/*/apps/mkvmergeGUI.png
 %{_mandir}/man1/*
 %lang(ja) %{_mandir}/ja/man1/*
+%lang(nl) %{_mandir}/nl/man1/*
 %lang(zh_CN) %{_mandir}/zh_CN/man1/*