- qt4-{moc,uic} -> {moc,uic}-qt4

[packages/mkvtoolnix.git] / mkvtoolnix.spec

diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index dacfbf9fa470648f908d805ca3d2257e31966a15..569c8fa1323b21f771bac83722018b7d31c6e0d6 100644 (file)
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -1,18 +1,19 @@
 # TODO:
-# - make subpackage -gui (wxWidgets deps)
+# - make -gui subpackages (wxWidgets and Qt4 deps)
 #
 # Conditional build
-%bcond_without gui     # disable GUI build (wxWigets deps)
+%bcond_without qt      # disable GUI build (Qt4 deps)
+%bcond_without wx      # disable GUI build (wxWigets deps)
 #
 Summary:       Matroska video utilities
-Summary(pl):   Narzêdzia do filmów w formacie Matroska
+Summary(pl.UTF-8):     Narzędzia do filmów w formacie Matroska
 Name:          mkvtoolnix
-Version:       1.8.0
+Version:       2.1.0
 Release:       1
 License:       GPL v2
 Group:         Applications/Multimedia
 Source0:       http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
-# Source0-md5: 318d5a366463efb6c4d873c4ee67e54b
+# Source0-md5: 0836c4fad0b8da784ef2ddd7a54e84b4
 Patch0:                %{name}-help.patch
 URL:           http://www.bunkus.org/videotools/mkvtoolnix/
 BuildRequires: bzip2-devel
@@ -24,29 +25,34 @@ BuildRequires:      libogg-devel
 BuildRequires: libvorbis-devel
 BuildRequires: lzo-devel
 BuildRequires: pcre-cxx-devel
+%{?with_qt:BuildRequires:      qt4-build >= 4.3.3-3}
 BuildRequires: sed >= 4.0
-%{?with_gui:BuildRequires:     wxGTK2-devel}
+%{?with_wx:BuildRequires:      wxGTK2-devel >= 2.6.0}
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Matroska video utilities.
 
-%description -l pl
-Narzêdzia do filmów w formacie Matroska.
+%description -l pl.UTF-8
+Narzędzia do filmów w formacie Matroska.
 
 %prep
 %setup -q
 %patch0 -p1
 
 %build
-%if %{with gui}
+%if %{with wx}
 %{__sed} -i 's,wx-config,wx-gtk2-ansi-config,g' configure
 %endif
 %{__sed} -i 's,$INSTDIR,%{_datadir}/%{name},' src/mmg/mmg.cpp
 
 %configure \
-       --enable-gui=%{?with_gui:yes}%{?!with_gui:no}
+       --enable-gui \
+       --%{?with_wx:en}%{?!with_wx:dis}able-wxwidgets \
+       --%{?with_qt:en}%{?!with_qt:dis}able-qt \
+       %{?with_qt:--with-moc=/usr/bin/moc-qt4} \
+       %{?with_qt:--with-uic=/usr/bin/uic-qt4}
 %{__make}
 
 %install