rpms/stage/F-12 import.log, NONE, 1.1 stage-3.2.2.fixcmake64.patch, NONE, 1.1 stage-3.2.2.fixdso.patch, NONE, 1.1 stage-3.2.2.fixexamples.patch, NONE, 1.1 stage-3.2.2.fixlibload.patch, NONE, 1.1 stage.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tue Mar 16 02:58:27 UTC 2010

Author: rmattes

Update of /cvs/pkgs/rpms/stage/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv345/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log stage-3.2.2.fixcmake64.patch 
	stage-3.2.2.fixdso.patch stage-3.2.2.fixexamples.patch 
	stage-3.2.2.fixlibload.patch stage.spec 
Log Message:
* Mon Mar 15 2010 Rich Mattes <richmattes at gmail.com> - 3.2.2-6
- Initial Import

--- NEW FILE import.log ---
stage-3_2_2-6_fc12:F-12:stage-3.2.2-6.fc12.src.rpm:1268708268

stage-3.2.2.fixcmake64.patch:
 CMakeLists.txt                          |    6 +++---
 cmake/internal/FindOS.cmake             |   23 +++++++++++++++++++++++
 examples/ctrl/CMakeLists.standalone.txt |    2 +-
 examples/ctrl/CMakeLists.txt            |    2 +-
 libstage/CMakeLists.txt                 |    2 +-
 stage.pc.in                             |    2 +-
 worlds/benchmark/CMakeLists.txt         |    2 +-
 7 files changed, 31 insertions(+), 8 deletions(-)

--- NEW FILE stage-3.2.2.fixcmake64.patch ---
diff -up ./cmake/internal/FindOS.cmake.fixcmake64 ./cmake/internal/FindOS.cmake
--- ./cmake/internal/FindOS.cmake.fixcmake64	2009-10-28 16:48:05.000000000 -0400
+++ ./cmake/internal/FindOS.cmake	2010-01-09 22:32:14.000000000 -0500
@@ -43,3 +43,26 @@ ELSEIF (PROJECT_OS_SOLARIS)
 ELSE (PROJECT_OS_LINUX)
     MESSAGE (STATUS "Operating system is generic Unix")
 ENDIF (PROJECT_OS_LINUX)
+
+# 32 or 64 bit Linux
+IF (PROJECT_OS_LINUX)
+    # Set the library directory suffix accordingly
+    IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+        SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
+        MESSAGE (STATUS "Linux x86_64 Detected")
+    ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
+        MESSAGE (STATUS "Linux ppc64 Detected")
+        SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
+    ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+ENDIF (PROJECT_OS_LINUX)
+
+IF(PROJECT_PROC_64BIT)
+    # Set the install path to lib64
+    SET(PROJECT_LIB_DIR "lib64")
+    SET(PROJECT_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/lib64/stage/")
+ELSE (PROJECT_PROC_64BIT)
+    SET(PROJECT_LIB_DIR "lib")
+    SET(PROJECT_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/lib/stage/")
+ENDIF (PROJECT_PROC_64BIT)
+
+MESSAGE(STATUS "Installing Libraries to ${PROJECT_LIB_DIR}")
diff -up ./CMakeLists.txt.fixcmake64 ./CMakeLists.txt
--- ./CMakeLists.txt.fixcmake64	2010-01-17 19:27:56.000000000 -0500
+++ ./CMakeLists.txt	2010-03-10 17:54:25.000000000 -0500
@@ -40,9 +40,9 @@ ENDIF (NOT PROJECT_OS_WIN AND NOT PROJEC
 
 #####################################
 # Build type cflags
-SET (CMAKE_CXX_FLAGS_RELEASE " -O3 -DNDEBUG ${WALL} " CACHE INTERNAL "C Flags for release" FORCE)
+SET (CMAKE_CXX_FLAGS_RELEASE "  -DNDEBUG ${WALL} " CACHE INTERNAL "C Flags for release" FORCE)
 SET (CMAKE_CXX_FLAGS_DEBUG " -ggdb  ${WALL} " CACHE INTERNAL "C Flags for debug" FORCE)
-SET (CMAKE_CXX_FLAGS_PROFILE " -O3 -ggdb -pg ${WALL} " CACHE INTERNAL "C Flags for profile" FORCE)
+SET (CMAKE_CXX_FLAGS_PROFILE "  -ggdb -pg ${WALL} " CACHE INTERNAL "C Flags for profile" FORCE)
 
 #####################################
 # Set the default build type
@@ -186,7 +186,7 @@ ENDIF( WEBSIM_FOUND )
 
 # Create the pkgconfig file
 CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/stage.pc.in ${CMAKE_CURRENT_BINARY_DIR}/stage.pc @ONLY)
-INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/stage.pc DESTINATION lib/pkgconfig/)
+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/stage.pc DESTINATION ${PROJECT_LIB_DIR}/pkgconfig/)
 
 MESSAGE( STATUS "Installation path CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" )
 
diff -up ./examples/ctrl/CMakeLists.standalone.txt.fixcmake64 ./examples/ctrl/CMakeLists.standalone.txt
--- ./examples/ctrl/CMakeLists.standalone.txt.fixcmake64	2009-10-28 16:48:05.000000000 -0400
+++ ./examples/ctrl/CMakeLists.standalone.txt	2010-01-09 21:30:01.000000000 -0500
@@ -22,5 +22,5 @@ endforeach( PLUGIN )
 SET_TARGET_PROPERTIES( ${PLUGINS} PROPERTIES PREFIX "" )
 
 # install in <prefix>/lib
-install( TARGETS ${PLUGINS} DESTINATION lib)
+install( TARGETS ${PLUGINS} DESTINATION ${PROJECT_LIB_DIR}/stage)
 
diff -up ./examples/ctrl/CMakeLists.txt.fixcmake64 ./examples/ctrl/CMakeLists.txt
--- ./examples/ctrl/CMakeLists.txt.fixcmake64	2009-10-28 16:48:05.000000000 -0400
+++ ./examples/ctrl/CMakeLists.txt	2010-01-09 21:59:30.000000000 -0500
@@ -37,5 +37,5 @@ SET_TARGET_PROPERTIES( ${PLUGINS} PROPER
 
 
 # install in <prefix>/lib
-install( TARGETS ${PLUGINS} DESTINATION lib)
+install( TARGETS ${PLUGINS} DESTINATION "${PROJECT_LIB_DIR}/stage")
 
diff -up ./libstage/CMakeLists.txt.fixcmake64 ./libstage/CMakeLists.txt
--- ./libstage/CMakeLists.txt.fixcmake64	2010-01-17 19:15:26.000000000 -0500
+++ ./libstage/CMakeLists.txt	2010-03-10 18:05:22.000000000 -0500
@@ -73,7 +73,7 @@ target_link_libraries( stagebinary stage
 
 INSTALL(TARGETS stagebinary stage
 	RUNTIME DESTINATION bin
-	LIBRARY DESTINATION lib
+	LIBRARY DESTINATION ${PROJECT_LIB_DIR}
 )
 
 INSTALL(FILES stage.hh 
diff -up ./stage.pc.in.fixcmake64 ./stage.pc.in
--- ./stage.pc.in.fixcmake64	2009-10-28 16:48:05.000000000 -0400
+++ ./stage.pc.in	2010-01-17 19:28:32.000000000 -0500
@@ -4,5 +4,5 @@ Name: stage
 Description: Stage robot simulation program, C++ library and Player plugin - part of the Player/Stage Project
 Version: @VERSION@
 Requires: 
-Libs: -L${prefix}/lib -lstage @FLTK_LDFLAGS@
+Libs: -L${prefix}/@PROJECT_LIB_DIR@ -lstage @FLTK_LDFLAGS@
 Cflags: -I${prefix}/include/Stage- at APIVERSION@ @FLTK_CFLAGS@ 
diff -up ./worlds/benchmark/CMakeLists.txt.fixcmake64 ./worlds/benchmark/CMakeLists.txt
--- ./worlds/benchmark/CMakeLists.txt.fixcmake64	2010-01-17 19:41:56.000000000 -0500
+++ ./worlds/benchmark/CMakeLists.txt	2010-01-17 20:29:25.000000000 -0500
@@ -10,4 +10,4 @@ TARGET_LINK_LIBRARIES( expand_pioneer st
 set_source_files_properties( ${expand_pioneerSrcs} PROPERTIES COMPILE_FLAGS "${FLTK_CFLAGS}" )
 SET_TARGET_PROPERTIES( expand_pioneer PROPERTIES PREFIX "" )
 
-INSTALL( TARGETS expand_swarm expand_pioneer DESTINATION lib)
+INSTALL( TARGETS expand_swarm expand_pioneer DESTINATION ${PROJECT_LIB_DIR}/stage)

stage-3.2.2.fixdso.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE stage-3.2.2.fixdso.patch ---
diff -up ./libstage/CMakeLists.txt.fixdso ./libstage/CMakeLists.txt
--- ./libstage/CMakeLists.txt.fixdso	2010-02-28 10:27:21.000000000 -0500
+++ ./libstage/CMakeLists.txt	2010-02-28 10:52:07.000000000 -0500
@@ -67,9 +67,9 @@ add_executable( stagebinary ${stagebinar
 # When compiling stagebinarySrcs, pass CFLAGS from fltk-config
 set_source_files_properties( ${stagebinarySrcs} PROPERTIES COMPILE_FLAGS "${FLTK_CFLAGS}" )
 
-set_target_properties( stagebinary PROPERTIES OUTPUT_NAME stage )
+set_target_properties( stagebinary PROPERTIES OUTPUT_NAME stage LINK_FLAGS "${FLTK_LDFLAGS}" )
 
-target_link_libraries( stagebinary stage )
+target_link_libraries( stagebinary stage pthread )
 
 INSTALL(TARGETS stagebinary stage
 	RUNTIME DESTINATION bin

stage-3.2.2.fixexamples.patch:
 CMakeLists.txt |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE stage-3.2.2.fixexamples.patch ---
diff -up ./worlds/CMakeLists.txt.fixexamples ./worlds/CMakeLists.txt
--- ./worlds/CMakeLists.txt.fixexamples	2009-10-28 16:48:05.000000000 -0400
+++ ./worlds/CMakeLists.txt	2010-01-10 00:29:21.000000000 -0500
@@ -1 +1,12 @@
 ADD_SUBDIRECTORY(benchmark)
+
+FILE( GLOB cfgs "*.cfg" )
+FILE( GLOB worlds "*.world" )
+FILE( GLOB incs "*.inc" )
+FILE( GLOB scripts "*.sh" )
+
+INSTALL(FILES ${cfgs} ${worlds} ${incs} ${scripts}
+DESTINATION share/stage/worlds)
+
+INSTALL (DIRECTORY bitmaps wifi DESTINATION share/stage/worlds)
+

stage-3.2.2.fixlibload.patch:
 config.h.in                   |    1 +
 libstage/model_load.cc        |    4 ++++
 libstageplugin/CMakeLists.txt |    3 +--
 3 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE stage-3.2.2.fixlibload.patch ---
diff -up ./config.h.in.fixlibload ./config.h.in
--- ./config.h.in.fixlibload	2009-10-28 16:48:05.000000000 -0400
+++ ./config.h.in	2010-01-09 22:32:39.000000000 -0500
@@ -5,6 +5,7 @@
 #define VERSION "@VERSION@"
 #define APIVERSION "@APIVERSION@"
 #define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
+#define PLUGIN_PATH "@PROJECT_PLUGIN_DIR@"
 
 #cmakedefine BUILD_GUI
 
diff -up ./libstage/model_load.cc.fixlibload ./libstage/model_load.cc
--- ./libstage/model_load.cc.fixlibload	2009-10-28 16:48:05.000000000 -0400
+++ ./libstage/model_load.cc	2010-01-09 22:35:22.000000000 -0500
@@ -10,6 +10,7 @@
 #include "stage.hh"
 #include "worldfile.hh"
 #include "file_manager.hh"
+#include "config.h"
 using namespace Stg;
 
 //#define DEBUG
@@ -309,6 +310,9 @@ void Model::LoadControllerModule( const 
 
   lt_dlsetsearchpath( FileManager::stagePath().c_str() );
 
+  // PLUGIN_PATH now defined in config.h
+  lt_dladdsearchdir( PLUGIN_PATH );
+
   lt_dlhandle handle = NULL;
   
   // the library name is the first word in the string
diff -up ./libstageplugin/CMakeLists.txt.fixlibload ./libstageplugin/CMakeLists.txt
--- ./libstageplugin/CMakeLists.txt.fixlibload	2010-01-09 21:30:42.000000000 -0500
+++ ./libstageplugin/CMakeLists.txt	2010-01-09 21:59:38.000000000 -0500
@@ -40,6 +40,5 @@ IF (BUILD_LSPTEST)
 ENDIF (BUILD_LSPTEST)
 
 INSTALL(TARGETS stageplugin
-	LIBRARY DESTINATION lib
-)
+	LIBRARY DESTINATION "${PROJECT_LIB_DIR}/player" )
 


--- NEW FILE stage.spec ---
Name:           stage
Version:        3.2.2
Release:        6%{?dist}
Summary:        A 2.5D multi-robot simulator

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://playerstage.sourceforge.net
Source0:        http://downloads.sourceforge.net/playerstage/Stage-%{version}-Source.tar.gz
# Fixes install path for cmake on 64 bit systems, and removes -O2 flag.  http://sourceforge.net/tracker/?func=detail&aid=2934664&group_id=42445&atid=433166
Patch0:         stage-3.2.2.fixcmake64.patch
# Fixes search path for included plugin libraries, which were moved to /usr/lib/stage.  Included in above patch submission.
# Proposed at http://old.nabble.com/Proposal%3A-Plugin-locations-for-Player-and-Stage-ts26868070.html 
Patch1:         stage-3.2.2.fixlibload.patch
# Fixes installation of example worlds, submitted at https://sourceforge.net/tracker/?func=detail&aid=2871625&group_id=42445&atid=433166
Patch2:         stage-3.2.2.fixexamples.patch
# Fixes DSO linking problem for executable.  Not yet submitted upstream.
Patch3:         stage-3.2.2.fixdso.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake
BuildRequires:  doxygen 
BuildRequires:  fltk-devel 
BuildRequires:  graphviz 
BuildRequires:  libjpeg-devel
BuildRequires:  libpng-devel 
BuildRequires:  libtool-ltdl-devel 
BuildRequires:  libXext-devel 
BuildRequires:  libX11-devel 
BuildRequires:  libGL-devel 
BuildRequires:  libGLU-devel 
BuildRequires:  player-devel >= 3.0.1

%description
Stage is a fast and scalable 2.5D multiple robot simulator from the Player 
project.  Stage can be used to simulate sensors and actuators in a 
low-fidelity bit-mapped environment.  Stage models can be controlled with
the Stage C API, or through the Player server via a Player plug-in library.

%package devel
Summary: Header files and libraries for Stage
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: fltk-devel 
Requires: libpng-devel 
Requires: libjpeg-devel 
Requires: libGL-devel 
Requires: libGLU-devel

%description devel
This package contains the header files and libraries
for Stage. If you want to develop programs using the libstage
API, you will need to install stage-devel.

%package playerplugin
Summary: Plug-in to add Stage support to Player
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: player >= 3.0.1

%description playerplugin
This package contains the Stage plug-in library for the Player server.
stage-playerplugin allows Stage models to be exposed as Player interfaces,
and manipulated through the Player server.

%package doc
Summary: Extra html documentation for Stage
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
BuildArch: noarch

%description doc
Comprehensive html documentation for the Stage programming API.

%prep
%setup -q -n Stage-%{version}-Source
%patch0 -p1 -b .fixcmake64
%patch1 -p1 -b .fixlibload
%patch2 -p1 -b .fixexamples
%patch3 -p1 -b .fixdso


%build
%cmake .

# Parallel build causes strange errors
make 

# Documentation builds separately
pushd docsrc
make
mv stage html
popd

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
chmod +x $RPM_BUILD_ROOT%{_datadir}/stage/worlds/*.sh

# These config files are broken, remove them
rm $RPM_BUILD_ROOT%{_datadir}/stage/worlds/uoa*
rm $RPM_BUILD_ROOT%{_datadir}/stage/worlds/large.world
rm $RPM_BUILD_ROOT%{_datadir}/stage/worlds/asr.*
rm -rf $RPM_BUILD_ROOT%{_datadir}/stage/worlds/wifi*


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING.txt DESCRIPTION.txt README.txt RELEASE.txt AUTHORS.txt
%{_bindir}/stage
%{_libdir}/*.so.*
%{_datadir}/stage
%{_libdir}/stage

%files playerplugin
%defattr(-,root,root,-)
%{_libdir}/player/*.so

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_includedir}/Stage-3.2

%files doc
%defattr(-,root,root,-)
%doc docsrc/html

%changelog
* Wed Mar 10 2010 Rich Mattes <richmattes at gmail.com> - 3.2.2-6
- Remove conflicting compiler flags

* Tue Mar 9 2010 Rich Mattes <richmattes at gmail.com> - 3.2.2-5
- Remove broken world files

* Sun Feb 28 2010 Rich Mattes <richmattes at gmail.com> - 3.2.2-4
- Fixed DSO link errors for F13
- Added necessary requires for -devel package
- Corrected Sourceforge download link

* Thu Feb 4 2010 Rich Mattes <richmattes at gmail.com> - 3.2.2-3
- More specfile cleanup

* Mon Jan 18 2010 Rich Mattes <richmattes at gmail.com> - 3.2.2-2
- Spec file cleanup
- License fixed

* Wed Sep 23 2009 Rich Mattes <richmattes at gmail.com> - 3.2.2-1
- First build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stage/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Mar 2010 22:06:38 -0000	1.1
+++ .cvsignore	16 Mar 2010 02:58:27 -0000	1.2
@@ -0,0 +1 @@
+Stage-3.2.2-Source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stage/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Mar 2010 22:06:39 -0000	1.1
+++ sources	16 Mar 2010 02:58:27 -0000	1.2
@@ -0,0 +1 @@
+ca93c7c9746354679829092640c49ec6  Stage-3.2.2-Source.tar.gz

