- rel 2; fix build

Changed files:
    libmediainfo-tinyxml.patch -> 1.1
    libmediainfo.spec -> 1.8

diff --git a/libmediainfo-tinyxml.patch b/libmediainfo-tinyxml.patch
new file mode 100644 (file)
index 0000000..568cae0
--- /dev/null
+++ b/libmediainfo-tinyxml.patch
@@ -0,0 +1,24 @@
+--- MediaInfoLib/Source/MediaInfo/Multiple/File_P2_Clip.cpp~   2011-01-03 19:29:58.000000000 +0100
++++ MediaInfoLib/Source/MediaInfo/Multiple/File_P2_Clip.cpp    2011-02-13 11:13:40.125000209 +0100
+@@ -35,7 +35,8 @@
+ #include "MediaInfo/MediaInfo_Internal.h"
+ #include "ZenLib/Dir.h"
+ #include "ZenLib/FileName.h"
+-#include "ZenLib/TinyXml/tinyxml.h"
++#define TIXML_USE_STL 1
++#include "tinyxml.h"
+ //---------------------------------------------------------------------------
+ 
+ namespace MediaInfoLib
+--- MediaInfoLib/Source/MediaInfo/Multiple/File_Xdcam_Clip.cpp~        2011-01-03 19:29:59.000000000 +0100
++++ MediaInfoLib/Source/MediaInfo/Multiple/File_Xdcam_Clip.cpp 2011-02-13 11:13:59.596902256 +0100
+@@ -36,7 +36,8 @@
+ #include "ZenLib/Dir.h"
+ #include "ZenLib/File.h"
+ #include "ZenLib/FileName.h"
+-#include "ZenLib/TinyXml/tinyxml.h"
++#define TIXML_USE_STL 1
++#include "tinyxml.h"
+ //---------------------------------------------------------------------------
+ 
+ namespace MediaInfoLib

diff --git a/libmediainfo.spec b/libmediainfo.spec
index 4f150e39f77efd030c70ed356aa6c69653278a5f..409dae25c59de05d9dd0c0b50630eca94e272384 100644 (file)
--- a/libmediainfo.spec
+++ b/libmediainfo.spec
@@ -2,12 +2,13 @@
 Summary:       Supplies technical and tag information about a video or audio file
 Name:          libmediainfo
 Version:       0.7.39
-Release:       1
+Release:       2
 License:       GPL
 Group:         Libraries
 URL:           http://mediainfo.sourceforge.net/
 Source0:       http://downloads.sourceforge.net/project/mediainfo/source/libmediainfo/%{version}/%{name}_%{version}.tar.bz2
 # Source0-md5: 111bb16f4515c5e58235272650ab4b35
+Patch0:                %{name}-tinyxml.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: dos2unix
@@ -16,6 +17,7 @@ BuildRequires:        libstdc++-devel
 BuildRequires: libtool
 BuildRequires: libzen-devel >= %{libzen_ver}
 BuildRequires: pkgconfig
+BuildRequires: tinyxml-devel
 BuildRequires: zlib-devel
 Requires:      libzen >= %{libzen_ver}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,6 +66,7 @@ Static libmediainfo library.
 
 %prep
 %setup -q -n MediaInfoLib
+%patch0 -p1
 cp           Release/ReadMe_DLL_Linux.txt ReadMe.txt
 mv           History_DLL.txt History.txt
 dos2unix     *.txt *.html Source/Doc/*.html