rpms/mkvtoolnix/devel .cvsignore, 1.5, 1.6 mkvtoolnix-gcc43.patch, 1.4, 1.5 mkvtoolnix.spec, 1.6, 1.7 sources, 1.5, 1.6

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14288

Modified Files:
	.cvsignore mkvtoolnix-gcc43.patch mkvtoolnix.spec sources 
Log Message:
- updated to 2.2.0
- dropped redundant BRs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Aug 2007 17:12:28 -0000	1.5
+++ .cvsignore	1 Jun 2008 08:43:38 -0000	1.6
@@ -1 +1 @@
-mkvtoolnix-2.1.0.tar.bz2
+mkvtoolnix-2.2.0.tar.bz2

mkvtoolnix-gcc43.patch:

Index: mkvtoolnix-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix-gcc43.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mkvtoolnix-gcc43.patch	14 Feb 2008 23:55:30 -0000	1.4
+++ mkvtoolnix-gcc43.patch	1 Jun 2008 08:43:38 -0000	1.5
@@ -1,18 +1,8 @@
-diff -up mkvtoolnix-2.1.0/src/common/common.h.gcc43 mkvtoolnix-2.1.0/src/common/common.h
---- mkvtoolnix-2.1.0/src/common/common.h.gcc43	2007-08-19 11:24:10.000000000 +0200
-+++ mkvtoolnix-2.1.0/src/common/common.h	2008-02-15 00:16:36.000000000 +0100
-@@ -19,7 +19,7 @@
- #include "os.h"
- 
- #include <stdarg.h>
--
-+#include <cstring>
- #include <string>
- #include <vector>
- 
-diff -up mkvtoolnix-2.1.0/src/common/random.h.gcc43 mkvtoolnix-2.1.0/src/common/random.h
---- mkvtoolnix-2.1.0/src/common/random.h.gcc43	2006-09-29 16:45:28.000000000 +0200
-+++ mkvtoolnix-2.1.0/src/common/random.h	2008-02-15 00:49:32.000000000 +0100
+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
  
@@ -22,21 +12,9 @@
  #include "mm_io.h"
  #include "smart_pointers.h"
  
-diff -up mkvtoolnix-2.1.0/src/common/common_memory.h.gcc43 mkvtoolnix-2.1.0/src/common/common_memory.h
---- mkvtoolnix-2.1.0/src/common/common_memory.h.gcc43	2007-01-15 16:27:42.000000000 +0100
-+++ mkvtoolnix-2.1.0/src/common/common_memory.h	2008-02-15 00:55:14.000000000 +0100
-@@ -19,7 +19,7 @@
- #include "os.h"
- 
- #include <cassert>
--
-+#include <cstdlib>
- #include <deque>
- #include <vector>
- 
-diff -up mkvtoolnix-2.1.0/src/common/xml_element_writer.h.gcc43 mkvtoolnix-2.1.0/src/common/xml_element_writer.h
---- mkvtoolnix-2.1.0/src/common/xml_element_writer.h.gcc43	2005-07-08 15:14:54.000000000 +0200
-+++ mkvtoolnix-2.1.0/src/common/xml_element_writer.h	2008-02-15 00:39:10.000000000 +0100
+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
 @@ -19,6 +19,7 @@
  #include "os.h"
  


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mkvtoolnix.spec	14 Feb 2008 23:19:52 -0000	1.6
+++ mkvtoolnix.spec	1 Jun 2008 08:43:38 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.1.0
-Release: 2%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
@@ -12,9 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils
 BuildRequires: flac-devel >= 1.1.1
-BuildRequires: libebml-devel >= 0.7.7
 BuildRequires: libmatroska-devel >= 0.8.1
-BuildRequires: libogg-devel
 BuildRequires: libvorbis-devel
 BuildRequires: pcre-devel
 BuildRequires: zlib-devel
@@ -103,6 +101,10 @@
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Sun Jun 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.2.0-1
+- updated to 2.2.0
+- dropped redundant BRs
+
 * Fri Feb 15 2008 Dominik Mierzejewski <rpm at greysector.net> 2.1.0-2
 - fixed build with gcc-4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Aug 2007 17:12:28 -0000	1.5
+++ sources	1 Jun 2008 08:43:38 -0000	1.6
@@ -1 +1 @@
-0836c4fad0b8da784ef2ddd7a54e84b4  mkvtoolnix-2.1.0.tar.bz2
+57397800c6be11db0b62e7285c8dab82  mkvtoolnix-2.2.0.tar.bz2