- enforce-use-stl.patch patch from debian

Changed files:
    enforce-use-stl.patch -> 1.1
    tinyxml.spec -> 1.11

diff --git a/enforce-use-stl.patch b/enforce-use-stl.patch
new file mode 100644 (file)
index 0000000..f930ba9
--- /dev/null
+++ b/enforce-use-stl.patch
@@ -0,0 +1,18 @@
+Description: TinyXml is built with TIXML_USE_STL, so we have to
+ enforce it when the library is used.
+Author: Felix Geyer <debfx-pkg@fobos.de>
+
+diff -Nur tinyxml-2.5.3/tinyxml.h tinyxml-2.5.3.patch/tinyxml.h
+--- tinyxml-2.5.3/tinyxml.h    2007-05-07 00:41:23.000000000 +0200
++++ tinyxml-2.5.3.patch/tinyxml.h      2009-07-08 22:32:03.000000000 +0200
+@@ -26,6 +26,10 @@
+ #ifndef TINYXML_INCLUDED
+ #define TINYXML_INCLUDED
+ 
++#ifndef TIXML_USE_STL
++      #define TIXML_USE_STL
++#endif
++
+ #ifdef _MSC_VER
+ #pragma warning( push )
+ #pragma warning( disable : 4530 )

diff --git a/tinyxml.spec b/tinyxml.spec
index a321b635f9812c1807641cb41a5517d90115b657..172ae71475c13cc67bc2fb9cbef5e5d198070af2 100644 (file)
--- a/tinyxml.spec
+++ b/tinyxml.spec
@@ -3,12 +3,13 @@ Summary:      A simple, small, C++ XML parser
 Summary(pl.UTF-8):     Prosty, mały, napisany w C++ parser XML
 Name:          tinyxml
 Version:       2.6.2
-Release:       2
+Release:       3
 License:       zlib
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/tinyxml/%{name}_%{file_version}.tar.gz
 # Source0-md5: c1b864c96804a10526540c664ade67f0
 Patch0:                %{name}-flags.patch
+Patch1:                enforce-use-stl.patch
 URL:           http://www.grinninglizard.com/tinyxml/
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
@@ -50,6 +51,7 @@ Statyczna biblioteka tinyxml.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \