Author: baggins Date: Tue Apr 5 17:17:59 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 2 - build system switched to rake - updated BRs
---- Files affected: packages/mkvtoolnix: mkvtoolnix.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: packages/mkvtoolnix/mkvtoolnix.spec diff -u packages/mkvtoolnix/mkvtoolnix.spec:1.38 packages/mkvtoolnix/mkvtoolnix.spec:1.39 --- packages/mkvtoolnix/mkvtoolnix.spec:1.38 Tue Apr 5 18:28:56 2011 +++ packages/mkvtoolnix/mkvtoolnix.spec Tue Apr 5 19:17:54 2011 @@ -12,7 +12,7 @@ Summary(pl.UTF-8): Narzędzia do filmów w formacie Matroska Name: mkvtoolnix Version: 4.6.0 -Release: 1 +Release: 2 License: GPL v2 Group: Applications/Multimedia Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2 @@ -20,14 +20,14 @@ Patch0: %{name}-init_locales.patch URL: http://www.bunkus.org/videotools/mkvtoolnix/ %{?with_qt:BuildRequires: QtGui-devel} -BuildRequires: boost-devel >= 1.34 +BuildRequires: boost-devel >= 1.36 BuildRequires: bzip2-devel BuildRequires: expat-devel BuildRequires: flac-devel BuildRequires: gettext-devel -BuildRequires: libebml-devel >= 0.7.7 +BuildRequires: libebml-devel >= 1.2.0 BuildRequires: libmagic-devel -BuildRequires: libmatroska-devel >= 0.8.1 +BuildRequires: libmatroska-devel >= 1.1.0 BuildRequires: libogg-devel BuildRequires: libvorbis-devel BuildRequires: lzo-devel @@ -36,6 +36,7 @@ BuildRequires: pkgconfig BuildRequires: qt4-build >= 4.3.3-3 %endif +BuildRequires: ruby-rake %{?with_wx:BuildRequires: wxGTK2-unicode-devel >= 2.6.0} BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -52,6 +53,7 @@ %build %configure \ + --docdir=%{_datadir}/%{name} \ --enable-gui \ --%{?with_wx:en}%{!?with_wx:dis}able-wxwidgets \ --%{?with_qt:en}%{!?with_qt:dis}able-qt \ @@ -62,13 +64,12 @@ %{?with_qt:--with-uic=/usr/bin/uic-qt4} \ %{?with_wx:--with-wx-config=/usr/bin/wx-gtk2-unicode-config} -%{__make} \ - %{?with_verbose:V=1} +rake %{?with_verbose:V=1} %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ +rake install \ INSTALL="install -cp" \ DESTDIR=$RPM_BUILD_ROOT @@ -101,6 +102,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.39 2011/04/05 17:17:54 baggins +- rel 2 +- build system switched to rake +- updated BRs + Revision 1.38 2011/04/05 16:28:56 baggins - 4.6.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mkvtoolnix/mkvtoolnix.spec?r1=1.38&r2=1.39&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
