rpms/mkvtoolnix/devel .cvsignore, 1.6, 1.7 mkvtoolnix-gcc43.patch, 1.5, 1.6 mkvtoolnix.spec, 1.7, 1.8 sources, 1.6, 1.7
Dominik Mierzejewski
rathann at fedoraproject.org
Sun Nov 30 21:32:52 UTC 2008
Author: rathann
Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31620
Modified Files:
.cvsignore mkvtoolnix-gcc43.patch mkvtoolnix.spec sources
Log Message:
* Sun Nov 30 2008 Dominik Mierzejewski <rpm at greysector.net> 2.4.0-1
- updated to 2.4.0
- rebased patch
- added new BRs
- added missing Requires: hicolor-icon-theme for hicolor icon dirs
- build and include more tools
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 1 Jun 2008 08:43:38 -0000 1.6
+++ .cvsignore 30 Nov 2008 21:32:21 -0000 1.7
@@ -1 +1 @@
-mkvtoolnix-2.2.0.tar.bz2
+mkvtoolnix-2.4.0.tar.bz2
mkvtoolnix-gcc43.patch:
Index: mkvtoolnix-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix-gcc43.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mkvtoolnix-gcc43.patch 1 Jun 2008 08:43:38 -0000 1.5
+++ mkvtoolnix-gcc43.patch 30 Nov 2008 21:32:21 -0000 1.6
@@ -1,20 +1,17 @@
-diff -up mkvtoolnix-2.2.0/src/common/common_memory.h.gcc43 mkvtoolnix-2.2.0/src/common/common_memory.h
-diff -up mkvtoolnix-2.2.0/src/common/common.h.gcc43 mkvtoolnix-2.2.0/src/common/common.h
-diff -up mkvtoolnix-2.2.0/src/common/random.h.gcc43 mkvtoolnix-2.2.0/src/common/random.h
---- mkvtoolnix-2.2.0/src/common/random.h.gcc43 2006-09-29 16:45:28.000000000 +0200
-+++ mkvtoolnix-2.2.0/src/common/random.h 2008-06-01 10:31:31.000000000 +0200
-@@ -17,7 +17,7 @@
- #define __RANDOM_H
+diff -up mkvtoolnix-2.4.0/src/common/random.h.gcc43 mkvtoolnix-2.4.0/src/common/random.h
+--- mkvtoolnix-2.4.0/src/common/random.h.gcc43 2006-09-29 16:45:28.000000000 +0200
++++ mkvtoolnix-2.4.0/src/common/random.h 2008-11-30 18:37:06.000000000 +0100
+@@ -18,6 +18,7 @@
#include "os.h"
--
+
+#include <memory>
#include "mm_io.h"
#include "smart_pointers.h"
-diff -up mkvtoolnix-2.2.0/src/common/xml_element_writer.h.gcc43 mkvtoolnix-2.2.0/src/common/xml_element_writer.h
---- mkvtoolnix-2.2.0/src/common/xml_element_writer.h.gcc43 2005-07-08 15:14:54.000000000 +0200
-+++ mkvtoolnix-2.2.0/src/common/xml_element_writer.h 2008-06-01 10:31:31.000000000 +0200
+diff -up mkvtoolnix-2.4.0/src/common/xml_element_writer.h.gcc43 mkvtoolnix-2.4.0/src/common/xml_element_writer.h
+--- mkvtoolnix-2.4.0/src/common/xml_element_writer.h.gcc43 2008-09-28 23:05:53.000000000 +0200
++++ mkvtoolnix-2.4.0/src/common/xml_element_writer.h 2008-11-30 18:36:13.000000000 +0100
@@ -19,6 +19,7 @@
#include "os.h"
Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mkvtoolnix.spec 1 Jun 2008 08:43:38 -0000 1.7
+++ mkvtoolnix.spec 30 Nov 2008 21:32:21 -0000 1.8
@@ -1,6 +1,6 @@
Summary: Matroska container manipulation utilities
Name: mkvtoolnix
-Version: 2.2.0
+Version: 2.4.0
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
@@ -10,7 +10,9 @@
Patch0: %{name}-gcc43.patch
URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+BuildRequires: boost-devel
BuildRequires: desktop-file-utils
+BuildRequires: file-devel
BuildRequires: flac-devel >= 1.1.1
BuildRequires: libmatroska-devel >= 0.8.1
BuildRequires: libvorbis-devel
@@ -29,6 +31,7 @@
Summary: Mkvtoolnix GUI
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
+Requires: hicolor-icon-theme
%description gui
GUI for mkvtoolnix.
@@ -37,14 +40,20 @@
%setup -q
%patch0 -p1 -b .gcc43
sed -i -e 's/"-O3"/""/' configure*
+for file in AUTHORS ChangeLog ; do
+ iconv -f iso8859-1 -t utf8 $file >$file.utf && \
+ touch -r $file $file.utf && \
+ mv $file.utf $file
+done
%build
%configure
%{__make} %{?_smp_mflags} V=1
+%{__make} %{?_smp_mflags} V=1 TOOLS=1 -C src
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true install
+%{__make} DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true TOOLS=1 install
desktop-file-install \
--vendor=livna \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -81,15 +90,18 @@
%defattr(644,root,root,0755)
%doc AUTHORS COPYING README ChangeLog TODO
%attr(755,root,root) %{_bindir}/base64tool
+%attr(755,root,root) %{_bindir}/diracparser
+%attr(755,root,root) %{_bindir}/ebml_validator
%attr(755,root,root) %{_bindir}/mkvextract
%attr(755,root,root) %{_bindir}/mkvmerge
+%attr(755,root,root) %{_bindir}/vc1parser
%{_mandir}/man1/base64tool*
%{_mandir}/man1/mkvextract*
%{_mandir}/man1/mkvmerge*
%files gui
-%doc doc/mkvmerge-gui.html
%defattr(644,root,root,0755)
+%doc doc/mkvmerge-gui.html
%attr(755,root,root) %{_bindir}/mkvinfo
%attr(755,root,root) %{_bindir}/mmg
%{_mandir}/man1/mkvinfo*
@@ -101,6 +113,13 @@
%{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
%changelog
+* Sun Nov 30 2008 Dominik Mierzejewski <rpm at greysector.net> 2.4.0-1
+- updated to 2.4.0
+- rebased patch
+- added new BRs
+- added missing Requires: hicolor-icon-theme for hicolor icon dirs
+- build and include more tools
+
* Sun Jun 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.2.0-1
- updated to 2.2.0
- dropped redundant BRs
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 1 Jun 2008 08:43:38 -0000 1.6
+++ sources 30 Nov 2008 21:32:21 -0000 1.7
@@ -1 +1 @@
-57397800c6be11db0b62e7285c8dab82 mkvtoolnix-2.2.0.tar.bz2
+125a6305de16236754d7554fa5b597cf mkvtoolnix-2.4.0.tar.bz2
More information about the fedora-extras-commits
mailing list