[vegastrike] Handle the boost_thread to boost_thread_mt change.
Bruno Wolff III
bruno at fedoraproject.org
Sat Jul 9 19:00:40 UTC 2011
commit af27ed2a20fb87447da8dac136cfc9a50abe3d22
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sat Jul 9 13:03:42 2011 -0500
Handle the boost_thread to boost_thread_mt change.
vegastrike-0.5.1-boost146.patch | 11 +++++++++++
vegastrike.spec | 4 ++++
2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/vegastrike-0.5.1-boost146.patch b/vegastrike-0.5.1-boost146.patch
new file mode 100644
index 0000000..8db336a
--- /dev/null
+++ b/vegastrike-0.5.1-boost146.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2011-07-09 12:58:35.217850007 -0500
++++ Makefile.in 2011-07-09 12:58:52.519048901 -0500
+@@ -1892,7 +1892,7 @@
+ src/xml_support.h
+
+ @BOOSTSYSTEM_FALSE@@HAVE_OGRE_TRUE at MESHER_BOOST_LIBS =
+- at BOOSTSYSTEM_TRUE@@HAVE_OGRE_TRUE at MESHER_BOOST_LIBS = -lboost_thread
++ at BOOSTSYSTEM_TRUE@@HAVE_OGRE_TRUE at MESHER_BOOST_LIBS = -lboost_thread_mt
+ @HAVE_OGRE_FALSE at MESHER_BOOST_LIBS =
+ mesher_CXXFLAGS = $(OGRE_CFLAGS) -I../../src -I../..
+ mesher_LDADD = $(OGRE_LIBS) -lexpat $(MESHER_BOOST_LIBS)
diff --git a/vegastrike.spec b/vegastrike.spec
index a02cb63..e4e4342 100644
--- a/vegastrike.spec
+++ b/vegastrike.spec
@@ -21,6 +21,7 @@ Patch6: vegastrike-0.5.1-sys-python.patch
Patch8: vegastrike-0.5.1-gcc44.patch
Patch9: vegastrike-0.5.0-glext.patch
Patch11: vegastrike-0.5.1-gcc46.patch
+Patch12: vegastrike-0.5.1-boost146.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel
BuildRequires: libjpeg-devel libpng-devel boost-devel expat-devel python-devel
@@ -48,6 +49,7 @@ Yet danger lurks in the space beyond.
%patch8 -p0
%patch9 -p1
%patch11 -p0
+%patch12 -p0
iconv -f ISO-8859-1 -t UTF-8 README > README.tmp
touch -r README README.tmp
mv README.tmp README
@@ -105,6 +107,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Jun 28 2011 Bruno Wolff III <bruno at wolff.to> - 0.5.1-0.1.beta1-2
- Update to upstream 0.5.1.beta1-2
+- Adjust existing patches for the update
+- Handle the boost_thread to boost_thread_mt change.
* Tue May 17 2011 Bruno Wolff III <bruno at wolff.to> - 0.5.0-23
- Rebuild for ogre 1.7.3
More information about the scm-commits
mailing list