diff --git a/import.log b/import.log index 37d7c00..dbbbb2e 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ plee-the-bear-0_4_1-2_fc12:devel:plee-the-bear-0.4.1-2.fc12.src.rpm:1259056233 +plee-the-bear-0_4_1-5_fc14:F-13:plee-the-bear-0.4.1-5.fc14.src.rpm:1266757063 diff --git a/plee-the-bear-0.4.1-boost.patch b/plee-the-bear-0.4.1-boost.patch new file mode 100644 index 0000000..585b615 --- /dev/null +++ b/plee-the-bear-0.4.1-boost.patch @@ -0,0 +1,65 @@ +diff -urp plee-the-bear-0.4.1/bear-engine/core/src/engine/CMakeLists.txt plee-the-bear-0.4.1.fixed/bear-engine/core/src/engine/CMakeLists.txt +--- plee-the-bear-0.4.1/bear-engine/core/src/engine/CMakeLists.txt 2009-07-30 12:54:26.000000000 +0200 ++++ plee-the-bear-0.4.1.fixed/bear-engine/core/src/engine/CMakeLists.txt 2010-02-17 23:28:41.005494996 +0100 +@@ -82,4 +82,5 @@ TARGET_LINK_LIBRARIES( + ${CLAW_DYNAMIC_LIBRARY_LIBRARIES} + ${CLAW_GRAPHIC_LIBRARIES} + ${Boost_FILESYSTEM_LIBRARY} ++ ${Boost_SYSTEM_LIBRARY} + ) +diff -urp plee-the-bear-0.4.1/bear-factory/animation-editor/src/bf/CMakeLists.txt plee-the-bear-0.4.1.fixed/bear-factory/animation-editor/src/bf/CMakeLists.txt +--- plee-the-bear-0.4.1/bear-factory/animation-editor/src/bf/CMakeLists.txt 2009-07-10 23:59:24.000000000 +0200 ++++ plee-the-bear-0.4.1.fixed/bear-factory/animation-editor/src/bf/CMakeLists.txt 2010-02-17 23:28:57.879653006 +0100 +@@ -26,6 +26,7 @@ TARGET_LINK_LIBRARIES( + ${CLAW_CONFIGURATION_FILE_LIBRARIES} + ${CLAW_LOGGER_LIBRARIES} + ${Boost_FILESYSTEM_LIBRARY} ++ ${Boost_SYSTEM_LIBRARY} + ) + + INSTALL( +diff -urp plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/CMakeLists.txt plee-the-bear-0.4.1.fixed/bear-factory/bear-editor/src/bf/CMakeLists.txt +--- plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/CMakeLists.txt 2009-09-02 23:14:42.000000000 +0200 ++++ plee-the-bear-0.4.1.fixed/bear-factory/bear-editor/src/bf/CMakeLists.txt 2010-02-17 23:28:51.792622452 +0100 +@@ -87,6 +87,7 @@ TARGET_LINK_LIBRARIES( + ${CLAW_LOGGER_LIBRARIES} + ${CLAW_CONFIGURATION_FILE_LIBRARIES} + ${Boost_FILESYSTEM_LIBRARY} ++ ${Boost_SYSTEM_LIBRARY} + ) + + INSTALL( +diff -urp plee-the-bear-0.4.1/bear-factory/CMakeLists.txt plee-the-bear-0.4.1.fixed/bear-factory/CMakeLists.txt +--- plee-the-bear-0.4.1/bear-factory/CMakeLists.txt 2009-09-02 23:14:42.000000000 +0200 ++++ plee-the-bear-0.4.1.fixed/bear-factory/CMakeLists.txt 2010-02-18 08:36:28.637517349 +0100 +@@ -68,7 +68,7 @@ INCLUDE_DIRECTORIES( + ${Boost_INCLUDE_DIR} + ) + +-FIND_PACKAGE( Boost 1.33 REQUIRED COMPONENTS filesystem ) ++FIND_PACKAGE( Boost 1.33 REQUIRED COMPONENTS filesystem system ) + + IF( NOT Boost_FOUND ) + MESSAGE( FATAL_ERROR +diff -urp plee-the-bear-0.4.1/bear-factory/level-editor/src/bf/CMakeLists.txt plee-the-bear-0.4.1.fixed/bear-factory/level-editor/src/bf/CMakeLists.txt +--- plee-the-bear-0.4.1/bear-factory/level-editor/src/bf/CMakeLists.txt 2009-07-10 23:59:24.000000000 +0200 ++++ plee-the-bear-0.4.1.fixed/bear-factory/level-editor/src/bf/CMakeLists.txt 2010-02-17 23:28:47.473614863 +0100 +@@ -76,6 +76,7 @@ TARGET_LINK_LIBRARIES( + ${CLAW_CONFIGURATION_FILE_LIBRARIES} + ${CLAW_LOGGER_LIBRARIES} + ${Boost_FILESYSTEM_LIBRARY} ++ ${Boost_SYSTEM_LIBRARY} + ) + + INSTALL( +diff -urp plee-the-bear-0.4.1/bear-factory/model-editor/src/bf/CMakeLists.txt plee-the-bear-0.4.1.fixed/bear-factory/model-editor/src/bf/CMakeLists.txt +--- plee-the-bear-0.4.1/bear-factory/model-editor/src/bf/CMakeLists.txt 2009-08-12 11:38:29.000000000 +0200 ++++ plee-the-bear-0.4.1.fixed/bear-factory/model-editor/src/bf/CMakeLists.txt 2010-02-17 23:28:49.674494003 +0100 +@@ -73,6 +73,7 @@ TARGET_LINK_LIBRARIES( + ${CLAW_CONFIGURATION_FILE_LIBRARIES} + ${CLAW_LOGGER_LIBRARIES} + ${Boost_FILESYSTEM_LIBRARY} ++ ${Boost_SYSTEM_LIBRARY} + ) + + INSTALL( diff --git a/plee-the-bear.spec b/plee-the-bear.spec index 99cb71c..e2a137c 100644 --- a/plee-the-bear.spec +++ b/plee-the-bear.spec @@ -1,12 +1,13 @@ Name: plee-the-bear Version: 0.4.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: 2D platform game Group: Amusements/Games # Code and artwork respectively License: GPLv2+ and CC-BY-SA URL: http://plee-the-bear.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/plee-the-bear/Plee%20the%20Bear/0.4/%{name}-%{version}.tar.gz +Patch0: plee-the-bear-0.4.1-boost.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: desktop-file-utils @@ -38,6 +39,7 @@ game counts several contributions from external people. %prep %setup -q +%patch0 -p1 %build @@ -97,6 +99,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Feb 17 2010 Lubomir Rintel - 0.4.1-5 +- Fix build + * Fri Jan 22 2010 Rahul Sundaram - 0.4.1-4 - Rebuild for Boost soname bump