rpms/plee-the-bear/EL-6 plee-the-bear-0.4.1-boost.patch, NONE, 1.1 import.log, 1.1, 1.2 plee-the-bear.spec, 1.2, 1.3

Lubomir Rintel lkundrak at fedoraproject.org
Thu Jul 8 15:30:25 UTC 2010


Author: lkundrak

Update of /cvs/pkgs/rpms/plee-the-bear/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10904/EL-6

Modified Files:
	import.log plee-the-bear.spec 
Added Files:
	plee-the-bear-0.4.1-boost.patch 
Log Message:
Pull from devel

plee-the-bear-0.4.1-boost.patch:
 bear-engine/core/src/engine/CMakeLists.txt          |    1 +
 bear-factory/CMakeLists.txt                         |    2 +-
 bear-factory/animation-editor/src/bf/CMakeLists.txt |    1 +
 bear-factory/bear-editor/src/bf/CMakeLists.txt      |    1 +
 bear-factory/level-editor/src/bf/CMakeLists.txt     |    1 +
 bear-factory/model-editor/src/bf/CMakeLists.txt     |    1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE plee-the-bear-0.4.1-boost.patch ---
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(


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/plee-the-bear/EL-6/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Nov 2009 09:53:06 -0000	1.1
+++ import.log	8 Jul 2010 15:30:25 -0000	1.2
@@ -1 +1,2 @@
 plee-the-bear-0_4_1-2_fc12:F-12:plee-the-bear-0.4.1-2.fc12.src.rpm:1259056372
+plee-the-bear-0_4_1-5_fc14:EL-6:plee-the-bear-0.4.1-5.fc14.src.rpm:1278603005


Index: plee-the-bear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plee-the-bear/EL-6/plee-the-bear.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- plee-the-bear.spec	29 Nov 2009 18:21:34 -0000	1.2
+++ plee-the-bear.spec	8 Jul 2010 15:30:25 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           plee-the-bear
 Version:        0.4.1
-Release:        3%{?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 e
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -97,6 +99,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Feb 17 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.4.1-5
+- Fix build
+
+* Fri Jan 22 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.4.1-4
+- Rebuild for Boost soname bump
+
 * Sun Nov 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.4.1-3
 - Fix libdir for 64-bit archs
 



More information about the scm-commits mailing list