[wesnoth] Patch for crash.

[Jon Ciesla]

commit a05f071d6828220429cc990535ac1a47eb9c0d49
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Apr 24 08:41:50 2013 -0500

    Patch for crash.

 wesnoth-1.10.6-crash.patch |   11 +++++++++++
 wesnoth.spec               |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/wesnoth-1.10.6-crash.patch b/wesnoth-1.10.6-crash.patch
new file mode 100644
index 0000000..b7d817d
--- /dev/null
+++ b/wesnoth-1.10.6-crash.patch
@@ -0,0 +1,11 @@
+--- src/tstring.hpp~	2013-01-01 03:34:55.000000000 -0600
++++ src/tstring.hpp	2013-04-24 07:38:35.454163885 -0500
+@@ -145,7 +145,7 @@
+ 	static t_string from_serialized(const std::string& string) { return t_string(base::from_serialized(string)); }
+ 	std::string to_serialized() const { return get().to_serialized(); }
+ 
+-	operator t_string_base() const { return get(); }
++	operator const t_string_base &() const { return get(); }
+ 
+ 	t_string operator+(const t_string& o) const { return get() + o.get(); }
+ 	t_string operator+(const std::string& o) const { return get() + o; }
diff --git a/wesnoth.spec b/wesnoth.spec
index 8981898..f98089d 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -3,7 +3,7 @@
 
 Name:           wesnoth
 Version:        1.10.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -19,6 +19,7 @@ Patch0:         %{name}-1.2.8-gcc43.patch
 #Patch4:		wesnoth-1.8.5-cstddef.patch
 #Patch5:		wesnoth-1.8.6-boost-foreach.patch
 #Patch6:		wesnoth-libpng15.patch
+Patch7:		wesnoth-1.10.6-crash.patch
 
 Requires:       wesnoth-data = %{version}
 BuildRequires:  SDL_image-devel
@@ -104,6 +105,7 @@ This package contains the data files for Wesnoth.
 #%patch4 -p0 -b .cstddef
 #%patch5 -p1 -b .boost-foreach
 #%patch6 -p0 -b .libpng
+%patch7 -p0 -b .crash
 
 %build
 # Cannot use configure macro because noarch-redhat-linux is not recognized by the auto tools in the tarball
@@ -337,6 +339,9 @@ fi
 #%endif
 
 %changelog
+* Wed Apr 24 2013 Jon Ciesla <limburgher at gmail.com> - 1.10.6-2
+- Fix for crash, BZ 953327.
+
 * Thu Mar 28 2013 Jon Ciesla <limburgher at gmail.com> - 1.10.6-1
 - New upstream maintainance release.