commit 0e32de335e631e991638224d401a8b863d2e4cc5
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Wed Jul 11 14:29:37 2012 +0200
Boost 1.50 requirest boost_system for boost_thread
boost-1.50.patch | 11 +++++++++++
ogre.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/boost-1.50.patch b/boost-1.50.patch
new file mode 100644
index 0000000..84c69d2
--- /dev/null
+++ b/boost-1.50.patch
@@ -0,0 +1,11 @@
+--- ogre_src_v1-8-0/CMake/Dependencies.cmake~ 2012-05-25 21:48:44.000000000
+0200
++++ ogre_src_v1-8-0/CMake/Dependencies.cmake 2012-07-11 14:26:31.685404862
+0200
+@@ -127,7 +127,7 @@
+ endif()
+ set(Boost_ADDITIONAL_VERSIONS "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0"
"1.47" "1.47.0" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0"
"1.41.0" "1.41" "1.40.0" "1.40")
+ # Components that need linking (NB does not include header-only components
like bind)
+-set(OGRE_BOOST_COMPONENTS thread date_time)
++set(OGRE_BOOST_COMPONENTS system thread date_time)
+ find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
+ if (NOT Boost_FOUND)
+ # Try again with the other type of libs
diff --git a/ogre.spec b/ogre.spec
index 6a9e3a4..7d2a636 100644
--- a/ogre.spec
+++ b/ogre.spec
@@ -18,6 +18,7 @@ License: MIT
Group: Applications
Source0:
http://downloads.sourceforge.net/ogre/%{name}_src_v%{_ver}.tar.bz2
# Source0-md5: 3b9bcd34a39891a8bf0385ae0c5c670b
+Patch0: boost-1.50.patch
URL: http://www.ogre3d.org/
BuildRequires: CEGUI-devel
BuildRequires: FreeImage-devel
@@ -76,6 +77,7 @@ Przykłady do OGRE.
%prep
%setup -q -n %{name}_src_v%{_ver}
+%patch0 -p1
%build
install -d build
@@ -106,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS BUGS COPYING README
%attr(755,root,root) %{_bindir}/Ogre*
%dir %{_libdir}/OGRE
-%attr(755,root,root) %{_libdir}/OGRE/*.so
+%attr(755,root,root) %{_libdir}/OGRE/*.so*
%attr(755,root,root) %{_libdir}/libOgreMain.so.*.*.*
%attr(755,root,root) %{_libdir}/libOgrePaging.so.*.*.*
%attr(755,root,root) %{_libdir}/libOgreProperty.so.*.*.*
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
