[wesnoth] Upstream maintenance release.

[Jon Ciesla]

commit b55eb3f2b584c047620844216d8bc85d3b2b5385
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Sep 30 11:30:45 2010 -0500

    Upstream maintenance release.

 .gitignore   |    1 +
 sources      |    2 +-
 wesnoth.spec |   10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fb09362..37654dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 wesnoth-1.8.3.tar.bz2
 wesnoth-1.8.4.tar.bz2
+/wesnoth-1.8.5.tar.bz2
diff --git a/sources b/sources
index beb01db..6a7fc14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2dce83f835ecce1d505ea60e46b7356f  wesnoth-1.8.4.tar.bz2
+a800285d1406690755dd0ea22b98b6df  wesnoth-1.8.5.tar.bz2
diff --git a/wesnoth.spec b/wesnoth.spec
index d559f2b..12ef3eb 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -1,5 +1,5 @@
 Name:           wesnoth
-Version:        1.8.4
+Version:        1.8.5
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
@@ -12,7 +12,7 @@ Source2:        %{name}.sysconfig
 Patch0:         %{name}-1.2.8-gcc43.patch
 Patch1:         wesnoth-1.5.11-remove-ogg-test.patch
 #Patch2:        wesnoth-1.6.4-fribidi.patch
-Patch3:         wesnoth-1.8.3-boost-iostreams.patch
+#Patch3:         wesnoth-1.8.3-boost-iostreams.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       wesnoth-data = %{version}
@@ -90,7 +90,7 @@ This package contains the data files for Wesnoth.
 %patch0 -p1 -b .gcc43
 %patch1 -p0
 #%patch2 -p0
-%patch3 -p1 -b .boost-iostreams
+#%patch3 -p1 -b .boost-iostreams
 autoreconf -i
 
 
@@ -256,6 +256,10 @@ fi
 #%endif
 
 %changelog
+* Thu Sep 30 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.5-1
+- Upstream maintenance release.
+- Boost iostreams patch upstreamed.
+
 * Tue Aug 10 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.4-1
 - Upstream maintenance release.