[wesnoth/f14/master] mschwendt boost fix.
Jon Ciesla
limb at fedoraproject.org
Thu Aug 5 19:18:18 UTC 2010
commit 838b51fb0ce8bac61b8f84257e38eb3933e74943
Author: Jon Ciesla <limb at jcomserv.net>
Date: Thu Aug 5 13:54:47 2010 -0500
mschwendt boost fix.
wesnoth-1.8.3-boost-iostreams.patch | 12 ++++++++++++
wesnoth.spec | 10 +++++++++-
2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/wesnoth-1.8.3-boost-iostreams.patch b/wesnoth-1.8.3-boost-iostreams.patch
new file mode 100644
index 0000000..5d2d81e
--- /dev/null
+++ b/wesnoth-1.8.3-boost-iostreams.patch
@@ -0,0 +1,12 @@
+diff -Nur wesnoth-1.8.3-orig/m4/boost.m4 wesnoth-1.8.3/m4/boost.m4
+--- wesnoth-1.8.3-orig/m4/boost.m4 2010-05-27 09:42:52.000000000 +0200
++++ wesnoth-1.8.3/m4/boost.m4 2010-08-05 19:23:54.000000000 +0200
+@@ -463,7 +463,7 @@
+ AC_DEFUN([BOOST_IOSTREAMS],
+ [BOOST_FIND_LIB([iostreams], [$1],
+ [boost/iostreams/device/file_descriptor.hpp],
+- [boost::iostreams::file_descriptor fd(0); fd.close();])
++ [boost::iostreams::file_descriptor fd(""); fd.close();])
+ ])# BOOST_IOSTREAMS
+
+
diff --git a/wesnoth.spec b/wesnoth.spec
index 04e3c06..7b15da8 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -1,6 +1,6 @@
Name: wesnoth
Version: 1.8.3
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Turn-based strategy game with a fantasy theme
Group: Amusements/Games
@@ -12,6 +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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: wesnoth-data = %{version}
@@ -89,6 +90,7 @@ This package contains the data files for Wesnoth.
%patch0 -p1 -b .gcc43
%patch1 -p0
#%patch2 -p0
+%patch3 -p1 -b .boost-iostreams
autoreconf -i
@@ -254,6 +256,12 @@ fi
#%endif
%changelog
+* Thu Aug 5 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.8.3-3
+- Fix boost.m4 configure check.
+
+* Wed Jul 28 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.3-2
+- Rebuild for new Boost.
+
* Tue Jul 06 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.3-1
- Upstream maintenance release.
More information about the scm-commits
mailing list