Author: gotar Date: Mon Aug 27 10:06:43 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - upgraded to 2.1.0, renamed gui bcond to wx, added qt bcond
---- Files affected: SPECS: mkvtoolnix.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/mkvtoolnix.spec diff -u SPECS/mkvtoolnix.spec:1.15 SPECS/mkvtoolnix.spec:1.16 --- SPECS/mkvtoolnix.spec:1.15 Sun Apr 22 11:46:21 2007 +++ SPECS/mkvtoolnix.spec Mon Aug 27 12:06:38 2007 @@ -1,19 +1,20 @@ # $Revision$, $Date$ # 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.UTF-8): Narzędzia do filmów w formacie Matroska Name: mkvtoolnix -Version: 2.0.2 +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: 48b478caef80117b6cd3cd9b06e9f104 +# Source0-md5: 0836c4fad0b8da784ef2ddd7a54e84b4 Patch0: %{name}-help.patch URL: http://www.bunkus.org/videotools/mkvtoolnix/ BuildRequires: bzip2-devel @@ -25,8 +26,9 @@ BuildRequires: libvorbis-devel BuildRequires: lzo-devel BuildRequires: pcre-cxx-devel +%{?with_qt:BuildRequires: qt4-build} BuildRequires: sed >= 4.0 -%{?with_gui:BuildRequires: wxGTK2-devel >= 2.6.0} +%{?with_wx:BuildRequires: wxGTK2-devel >= 2.6.0} BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -41,13 +43,17 @@ %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/qt4-moc} \ + %{?with_qt:--with-uic=/usr/bin/qt4-uic} %{__make} %install @@ -77,6 +83,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.16 2007/08/27 10:06:38 gotar +- upgraded to 2.1.0, renamed gui bcond to wx, added qt bcond + Revision 1.15 2007/04/22 09:46:21 pluto - updated to 2.0.2. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mkvtoolnix.spec?r1=1.15&r2=1.16&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
