rpms/player/F-12 player-3.0.0-fixcmake64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 player.spec, 1.10, 1.11 sources, 1.2, 1.3 player-2.1.0rc2-paths.patch, 1.1, NONE player-2.1.1-gcc43.patch, 1.1, NONE player-2.1.1-gcc44.patch, 1.1, NONE player-2.1.1-norpath.patch, 1.1, NONE player-2.1.1-plugindir.patch, 1.1, NONE player-2.1.1-serialtypes.patch, 1.1, NONE
Tim Niemueller
timn at fedoraproject.org
Thu Nov 5 23:50:59 UTC 2009
Author: timn
Update of /cvs/pkgs/rpms/player/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5644
Modified Files:
.cvsignore player.spec sources
Added Files:
player-3.0.0-fixcmake64.patch
Removed Files:
player-2.1.0rc2-paths.patch player-2.1.1-gcc43.patch
player-2.1.1-gcc44.patch player-2.1.1-norpath.patch
player-2.1.1-plugindir.patch player-2.1.1-serialtypes.patch
Log Message:
* Sun Oct 18 2009 Tim Niemueller <tim at niemueller.de> - 3.0.0-3
- Merge Rich's changes with Fedora spec file
* Sat Oct 10 2009 Rich Mattes <richmattes at gmail.com> - 3.0.0-2
- Fixed x86_64 build issues
- Fixed x86_64 library install path
- Fixed mock i586 and x86_64 dep issues
- Enabled Python C++ and Ruby C++ bindings
- Made doc and examples packages .noarch
* Wed Oct 7 2009 Rich Mattes <richmattes at gmail.com> - 3.0.0-1
- Upgrade package to Player 3.0.0
player-3.0.0-fixcmake64.patch:
client_libs/libplayerc++/bindings/python/CMakeLists.txt | 4 +-
client_libs/libplayerc++/bindings/ruby/CMakeLists.txt | 1
client_libs/libplayerc/bindings/python/CMakeLists.txt | 2 -
client_libs/libplayerc/bindings/ruby/CMakeLists.txt | 2 +
cmake/UsePlayerC++.cmake.in | 2 -
cmake/UsePlayerC.cmake.in | 2 -
cmake/UsePlayerPlugin.cmake.in | 4 +-
cmake/internal/FindOS.cmake | 24 ++++++++++++++++
cmake/internal/LibraryUtils.cmake | 8 ++---
cmake/internal/SetupDirectories.cmake | 9 ++++++
cmake/pkgconfig.cmake | 4 +-
11 files changed, 49 insertions(+), 13 deletions(-)
--- NEW FILE player-3.0.0-fixcmake64.patch ---
diff -up ./client_libs/libplayerc/bindings/python/CMakeLists.txt.fixcmake64 ./client_libs/libplayerc/bindings/python/CMakeLists.txt
--- ./client_libs/libplayerc/bindings/python/CMakeLists.txt.fixcmake64 2009-10-10 16:16:36.034486739 -0400
+++ ./client_libs/libplayerc/bindings/python/CMakeLists.txt 2009-10-10 16:16:52.346770896 -0400
@@ -54,7 +54,7 @@ IF (PYTHONINTERP_FOUND)
ERROR_VARIABLE pythonVersionString
ERROR_STRIP_TRAILING_WHITESPACE)
STRING (REGEX REPLACE "^Python ([0-9]+\\.[0-9]+).*" "\\1" pythonVersion ${pythonVersionString})
- SET (playercpyInstallDir lib/python${pythonVersion}/site-packages)
+ SET (playercpyInstallDir ${PLAYER_LIBRARY_INSTALL_DIR}/python${pythonVersion}/site-packages)
ENDIF (PYTHON_OS_WIN)
SET (PYTHON_BINDINGS_INSTALL_DIR ${playercpyInstallDir} CACHE PATH "Python bindings installation directory under $prefix")
MARK_AS_ADVANCED (PYTHON_BINDINGS_INSTALL_DIR)
diff -up ./client_libs/libplayerc++/bindings/python/CMakeLists.txt.fixcmake64 ./client_libs/libplayerc++/bindings/python/CMakeLists.txt
--- ./client_libs/libplayerc++/bindings/python/CMakeLists.txt.fixcmake64 2009-10-10 16:34:48.741962339 -0400
+++ ./client_libs/libplayerc++/bindings/python/CMakeLists.txt 2009-10-10 16:35:13.234691459 -0400
@@ -36,7 +36,7 @@ IF(BUILD_PLAYERCC)
ERROR_VARIABLE pythonVersionString
ERROR_STRIP_TRAILING_WHITESPACE)
STRING (REGEX REPLACE "^Python ([0-9]+\\.[0-9]+).*" "\\1" pythonVersion ${pythonVersionString})
- SET (playercpppyInstallDir lib/python${pythonVersion}/site-packages)
+ SET (playercpppyInstallDir ${PLAYER_LIBRARY_INSTALL_DIR}/python${pythonVersion}/site-packages)
ENDIF (PYTHON_OS_WIN)
SET (PYTHON_BINDINGS_INSTALL_DIR ${playercpppyInstallDir} CACHE PATH "Python bindings installation directory under $prefix")
MARK_AS_ADVANCED (PYTHON_BINDINGS_INSTALL_DIR)
@@ -55,4 +55,4 @@ IF(BUILD_PLAYERCC)
ENDIF (PYTHONINTERP_FOUND)
ELSE (BUILD_PLAYERCC)
MESSAGE (STATUS "Python bindings for C++ client library will not be built - playerc++ client library disabled")
-ENDIF (BUILD_PLAYERCC)
\ No newline at end of file
+ENDIF (BUILD_PLAYERCC)
diff -up ./client_libs/libplayerc/bindings/ruby/CMakeLists.txt.fixcmake64 ./client_libs/libplayerc/bindings/ruby/CMakeLists.txt
--- ./client_libs/libplayerc/bindings/ruby/CMakeLists.txt.fixcmake64 2009-10-10 16:17:34.182093303 -0400
+++ ./client_libs/libplayerc/bindings/ruby/CMakeLists.txt 2009-10-10 16:28:56.154495502 -0400
@@ -56,12 +56,14 @@ IF(RUBY_FOUND)
STRING(REPLACE "/usr/" "" ruby_relative_sitelib_dir ${RUBY_SITELIB_DIR})
STRING(REPLACE "/opt/" "" ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir})
STRING(REPLACE "local/" "" ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir})
+ STRING(REPLACE "lib/" ${PLAYER_LIBRARY_INSTALL_DIR}/ ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir} )
SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitelib_dir} CACHE PATH "Ruby bindings installation directory under $RUBY_SITELIB_DIR")
MARK_AS_ADVANCED (RUBY_BINDINGS_INSTALL_DIR)
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/playercr.so
DESTINATION ${RUBY_BINDINGS_INSTALL_DIR}
RENAME playerc.so)
+ MESSAGE (STATUS "Ruby bindings for C client will be installed to ${RUBY_BINDINGS_INSTALL_DIR}")
ELSE (SWIG_FOUND)
MESSAGE (STATUS "Ruby bindings for C client library will not be built - could not find Swig")
ENDIF (SWIG_FOUND)
diff -up ./client_libs/libplayerc++/bindings/ruby/CMakeLists.txt.fixcmake64 ./client_libs/libplayerc++/bindings/ruby/CMakeLists.txt
--- ./client_libs/libplayerc++/bindings/ruby/CMakeLists.txt.fixcmake64 2009-10-10 16:35:23.641448030 -0400
+++ ./client_libs/libplayerc++/bindings/ruby/CMakeLists.txt 2009-10-10 16:36:32.493355921 -0400
@@ -34,6 +34,7 @@ IF(BUILD_PLAYERCC)
STRING(REPLACE "/usr/" "" ruby_relative_sitelib_dir ${RUBY_SITELIB_DIR})
STRING(REPLACE "/opt/" "" ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir})
STRING(REPLACE "local/" "" ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir})
+ STRING(REPLACE "lib/" ${PLAYER_LIBRARY_INSTALL_DIR}/ ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir})
SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitelib_dir} CACHE PATH "Ruby bindings for the c++ library installation directory under $RUBY_SITELIB_DIR")
MARK_AS_ADVANCED (RUBY_BINDINGS_INSTALL_DIR)
diff -up ./cmake/internal/FindOS.cmake.fixcmake64 ./cmake/internal/FindOS.cmake
--- ./cmake/internal/FindOS.cmake.fixcmake64 2009-10-10 15:53:53.131535547 -0400
+++ ./cmake/internal/FindOS.cmake 2009-10-10 19:47:42.942189730 -0400
@@ -43,3 +43,27 @@ ELSEIF (PLAYER_OS_SOLARIS)
ELSE (PLAYER_OS_LINUX)
MESSAGE (STATUS "Operating system is generic Unix")
ENDIF (PLAYER_OS_LINUX)
+
+
+##RJM 10/09
+#SET (PLAYER_PROC_64BIT FALSE BOOL INTERNAL)
+#SET (PLAYER_PROC_PPC64 FALSE BOOL INTERNAL)
+#SET (PLAYER_PROC_X86_64 FALSE BOOL INTERNAL)
+
+MESSAGE (STATUS "Got System Processor ${CMAKE_SYSTEM_PROCESSOR}")
+
+# 32 or 64 bit Linux
+IF (PLAYER_OS_LINUX)
+ # Set the library directory suffix accordingly
+ IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+ SET (PLAYER_PROC_64BIT TRUE BOOL INTERNAL)
+ MESSAGE (STATUS "Linux x86_64 Detected")
+ ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
+ MESSAGE (STATUS "Linux ppc64 Detected")
+ SET (PLAYER_PROC_64BIT TRUE BOOL INTERNAL)
+ ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+ENDIF (PLAYER_OS_LINUX)
+
+
+
+##/RJM 10/09
diff -up ./cmake/internal/LibraryUtils.cmake.fixcmake64 ./cmake/internal/LibraryUtils.cmake
--- ./cmake/internal/LibraryUtils.cmake.fixcmake64 2009-10-10 15:54:16.859529600 -0400
+++ ./cmake/internal/LibraryUtils.cmake 2009-10-10 15:37:02.555826489 -0400
@@ -16,9 +16,9 @@ MACRO (PLAYER_ADD_LIBRARY _name)
VERSION ${PLAYER_VERSION}
SOVERSION ${PLAYER_API_VERSION}
INSTALL_NAME_DIR ${RPATH_VAL}
- INSTALL_RPATH "${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/lib"
+ INSTALL_RPATH "${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/${PLAYER_LIBRARY_INSTALL_DIR}"
BUILD_WITH_INSTALL_RPATH TRUE)
- INSTALL (TARGETS ${_name} DESTINATION lib/ COMPONENT libraries)
+ INSTALL (TARGETS ${_name} DESTINATION ${PLAYER_LIBRARY_INSTALL_DIR}/ COMPONENT libraries)
ENDMACRO (PLAYER_ADD_LIBRARY)
@@ -28,7 +28,7 @@ ENDMACRO (PLAYER_ADD_LIBRARY)
MACRO (PLAYER_ADD_EXECUTABLE _name)
ADD_EXECUTABLE (${_name} ${ARGN})
SET_TARGET_PROPERTIES (${_name} PROPERTIES
- INSTALL_RPATH "${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/lib"
+ INSTALL_RPATH "${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/${PLAYER_LIBRARY_INSTALL_DIR}"
BUILD_WITH_INSTALL_RPATH TRUE)
INSTALL (TARGETS ${_name} RUNTIME DESTINATION bin/ COMPONENT applications)
ENDMACRO (PLAYER_ADD_EXECUTABLE)
@@ -191,7 +191,7 @@ MACRO (PLAYER_MAKE_PKGCONFIG _name _desc
ENDIF (${_intDeps})
CONFIGURE_FILE (${PLAYER_CMAKE_DIR}/pkgconfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_name}.pc @ONLY)
- INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_name}.pc DESTINATION lib/pkgconfig/ COMPONENT pkgconfig)
+ INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_name}.pc DESTINATION ${PLAYER_LIBRARY_INSTALL_DIR}/pkgconfig/ COMPONENT pkgconfig)
ENDMACRO (PLAYER_MAKE_PKGCONFIG)
diff -up ./cmake/internal/SetupDirectories.cmake.fixcmake64 ./cmake/internal/SetupDirectories.cmake
--- ./cmake/internal/SetupDirectories.cmake.fixcmake64 2009-10-10 15:54:35.998544437 -0400
+++ ./cmake/internal/SetupDirectories.cmake 2009-10-10 19:39:31.492830576 -0400
@@ -10,3 +10,12 @@ MESSAGE (STATUS "Player will be installe
# Installation prefix for include files
STRING (TOLOWER ${PROJECT_NAME} projectNameLower)
SET (PLAYER_INCLUDE_INSTALL_DIR "include/${projectNameLower}-${PLAYER_MAJOR_VERSION}.${PLAYER_MINOR_VERSION}")
+
+IF (PLAYER_PROC_64BIT)
+ SET (PLAYER_LIBRARY_INSTALL_DIR "lib64")
+ MESSAGE (STATUS "Player libraries will be in lib64")
+ELSE (PLAYER_PROC_64BIT)
+ SET (PLAYER_LIBRARY_INSTALL_DIR "lib")
+ MESSAGE (STATUS "Player libraries will be in lib")
+ENDIF (PLAYER_PROC_64BIT)
+
diff -up ./CMakeLists.txt.fixcmake64 ./CMakeLists.txt
diff -up ./cmake/pkgconfig.cmake.fixcmake64 ./cmake/pkgconfig.cmake
--- ./cmake/pkgconfig.cmake.fixcmake64 2009-10-10 15:53:12.368520431 -0400
+++ ./cmake/pkgconfig.cmake 2009-10-10 15:34:39.638615068 -0400
@@ -1,7 +1,7 @@
# This file was generated by CMake for @PROJECT_NAME@ library @PKG_NAME@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=${prefix}/@PLAYER_LIBRARY_INSTALL_DIR@
includedir=${prefix}/include
Name: @PKG_NAME@
@@ -9,4 +9,4 @@ Description: @PKG_DESC@
Version: @PLAYER_VERSION@
Requires: @PKG_EXTERNAL_DEPS@
Libs: -L${libdir} -l at PKG_NAME@ @PKG_LIBFLAGS@ @PKG_INTERNAL_DEPS@
-Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@ @PKG_CFLAGS@
\ No newline at end of file
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@ @PKG_CFLAGS@
diff -up ./cmake/UsePlayerC.cmake.in.fixcmake64 ./cmake/UsePlayerC.cmake.in
--- ./cmake/UsePlayerC.cmake.in.fixcmake64 2009-10-10 16:07:01.819944914 -0400
+++ ./cmake/UsePlayerC.cmake.in 2009-10-10 16:09:55.354540506 -0400
@@ -14,7 +14,7 @@ IF (NOT PKG_CONFIG_FOUND)
SET (PLAYERC_LINK_LIBS @PLAYERC_EXTRA_LINK_LIBRARIES@)
LIST (APPEND PLAYERC_LINK_LIBS "playerc")
SET (PLAYERC_LIBRARY_DIRS @PLAYERC_EXTRA_LINK_DIRS@)
- LIST (APPEND PLAYERC_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/lib")
+ LIST (APPEND PLAYERC_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/@PLAYER_LIBRARY_INSTALL_DIR@")
SET (PLAYERC_LINK_FLAGS "")
ELSE (NOT PKG_CONFIG_FOUND)
pkg_check_modules (PLAYERC_PKG REQUIRED playerc)
diff -up ./cmake/UsePlayerC++.cmake.in.fixcmake64 ./cmake/UsePlayerC++.cmake.in
--- ./cmake/UsePlayerC++.cmake.in.fixcmake64 2009-10-10 16:07:08.168926125 -0400
+++ ./cmake/UsePlayerC++.cmake.in 2009-10-10 16:09:54.554318560 -0400
@@ -14,7 +14,7 @@ IF (NOT PKG_CONFIG_FOUND)
SET (PLAYERCPP_LINK_LIBS @PLAYERCC_EXTRA_LINK_LIBRARIES@)
LIST (APPEND PLAYERCPP_LINK_LIBS "playerc++")
SET (PLAYERCPP_LIBRARY_DIRS @PLAYERCC_EXTRA_LINK_DIRS@)
- LIST (APPEND PLAYERCPP_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/lib")
+ LIST (APPEND PLAYERCPP_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/@PLAYER_LIBRARY_INSTALL_DIR@")
SET (PLAYERCPP_LINK_FLAGS "")
ELSE (NOT PKG_CONFIG_FOUND)
pkg_check_modules (PLAYERCPP_PKG REQUIRED playerc++)
diff -up ./cmake/UsePlayerPlugin.cmake.in.fixcmake64 ./cmake/UsePlayerPlugin.cmake.in
--- ./cmake/UsePlayerPlugin.cmake.in.fixcmake64 2009-10-10 16:06:46.901602884 -0400
+++ ./cmake/UsePlayerPlugin.cmake.in 2009-10-10 16:09:55.983149732 -0400
@@ -14,7 +14,7 @@ IF (NOT PKG_CONFIG_FOUND)
SET (PLUGIN_PLAYERC_LINK_LIBS @PLAYERC_EXTRA_LINK_LIBRARIES@)
LIST (APPEND PLUGIN_PLAYERC_LINK_LIBS "playerc")
SET (PLUGIN_PLAYERC_LIBRARY_DIRS @PLAYERC_EXTRA_LINK_DIRS@)
- LIST (APPEND PLUGIN_PLAYERC_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/lib")
+ LIST (APPEND PLUGIN_PLAYERC_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/@PLAYER_LIBRARY_INSTALL_DIR@")
SET (PLUGIN_PLAYERC_LINK_FLAGS "")
ELSE (NOT PKG_CONFIG_FOUND)
pkg_check_modules (PLUGIN_PLAYERC_PKG REQUIRED playerc)
@@ -41,7 +41,7 @@ IF (NOT PKG_CONFIG_FOUND)
SET (PLAYERCORE_LINK_LIBS @PLAYERCORE_EXTRA_LINK_LIBRARIES@)
LIST (APPEND PLAYERCORE_LINK_LIBS "playercore")
SET (PLAYERCORE_LIBRARY_DIRS @PLAYERCORE_EXTRA_LINK_DIRS@)
- LIST (APPEND PLAYERCORE_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/lib")
+ LIST (APPEND PLAYERCORE_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/@PLAYER_LIBRARY_INSTALL_DIR@")
SET (PLAYERCORE_LINK_FLAGS "")
ELSE (NOT PKG_CONFIG_FOUND)
pkg_check_modules (PLAYERCORE_PKG REQUIRED playercore)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 13 Aug 2008 09:07:33 -0000 1.2
+++ .cvsignore 5 Nov 2009 23:50:57 -0000 1.3
@@ -1 +1 @@
-player-2.1.1.tar.bz2
+player-3.0.0.tar.gz
Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-12/player.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- player.spec 21 Aug 2009 15:27:31 -0000 1.10
+++ player.spec 5 Nov 2009 23:50:58 -0000 1.11
@@ -1,47 +1,50 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: player
-Version: 2.1.1
-Release: 13%{?dist}
+Version: 3.0.0
+Release: 3%{?dist}
Summary: Cross-platform robot device interface and server
Group: Applications/System
License: GPLv2+ and LGPLv2+
URL: http://playerstage.sourceforge.net
-Source0: http://mesh.dl.sourceforge.net/sourceforge/playerstage/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/project/playerstage/Player/%{version}/%{name}-%{version}.tar.gz
Source1: playernav.desktop
Source2: playercam.desktop
Source3: playerv.desktop
-Patch0: %{name}-2.1.1-gcc43.patch
-Patch1: %{name}-2.1.1-norpath.patch
-Patch2: %{name}-2.1.0rc2-paths.patch
-Patch3: %{name}-2.1.1-plugindir.patch
-Patch4: %{name}-2.1.1-serialtypes.patch
-Patch5: %{name}-2.1.1-gcc44.patch
+Patch0: %{name}-3.0.0-fixcmake64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf, automake
+# Sort order: build tools, feature libs, within alphabetically, group related
+# entries on single line (most dominant lib first or alphabetically)
+
+# Build tools
+BuildRequires: cmake
+BuildRequires: desktop-file-utils
+BuildRequires: doxygen, graphviz, texlive-latex, texlive, texlive-dvips, latex2html
BuildRequires: libtool, libtool-ltdl-devel
-%if 0%{?fedora} <= 9
-BuildRequires: geos-devel
-%endif
-BuildRequires: libraw1394-devel, libdc1394-devel
-BuildRequires: opencv-devel
+# Libs to enable Player features
BuildRequires: alsa-lib-devel
-BuildRequires: libstatgrab-devel
-BuildRequires: libpqxx-devel
+BuildRequires: avahi-compat-howl-devel
+BuildRequires: boost-devel
+BuildRequires: festival-devel
+BuildRequires: fltk-devel
+BuildRequires: geos-devel
BuildRequires: gsl-devel
-BuildRequires: python, python-devel, swig
-BuildRequires: libjpeg-devel
-BuildRequires: openssl-devel
-BuildRequires: ImageMagick-devel
BuildRequires: gtk2-devel, libgnomecanvas-devel
+BuildRequires: ImageMagick-devel
+BuildRequires: libdc1394-devel, libraw1394-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpqxx-devel
+BuildRequires: libstatgrab-devel
+BuildRequires: libXmu-devel
BuildRequires: mesa-libGL-devel, freeglut-devel
-BuildRequires: boost-devel
-BuildRequires: avahi-compat-howl-devel
+BuildRequires: opencv-devel
+BuildRequires: openssl-devel
+BuildRequires: perl
+BuildRequires: python, python-devel, swig
+BuildRequires: ruby, ruby-devel
BuildRequires: zlib-devel
-BuildRequires: doxygen, graphviz
-BuildRequires: desktop-file-utils
%description
Player is a network server for robot control. Running on your robot, Player
@@ -55,7 +58,7 @@ devices on the fly. Player supports a va
Summary: Header files and libraries for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Requires: pkgconfig cmake
%description devel
This package contains the header files and libraries
@@ -65,6 +68,7 @@ you will need to install %{name}-devel.
%package doc
Summary: Development documentation for Player
Group: Documentation
+BuildArch: noarch
%description doc
This package contains the development documentation for Player.
@@ -73,73 +77,61 @@ This package contains the development do
Summary: Player Python bindings
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: python >= 2.5
+Requires: python >= 2.6
%description python
This package contains the Python bindings for %{name}.
If you like to develop programs using %{name} in Python
-you will need to install this package.
+you will need to install this package. Includes bindings
+built against the C and C++ client libraries.
%package examples
-Summary: Examples for Player
+Summary: Examples and templates for Player
Group: Development/Tools
Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
%description examples
-This package contains examples for Player.
+This package contains example code for %{name} development.
+Included are sample plugin drivers, and examples made using
+the python, C, and C++ client libraries.
-%package static
-Summary: Static libraries for %{name}
+%package ruby
+Summary: Ruby bindings for %{name}
Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: ruby >= 1.8
-%description static
-This package contains static libraries that can be used to
-compile static binaries using Player.
+%description ruby
+This package contains the Ruby client-side bindings for %{name}.
+If you would like to build %{name} clients using Ruby you
+will need to install this package. Includes bindings built
+against the C and C++ client libraries. Ruby bindings
+are experimental.
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .gcc43
-%patch1 -p1 -b .norpath
-%patch2 -p1 -b .paths
-%patch3 -p1 -b .plugindir
-%patch4 -p1 -b .serialtypes
-%patch5 -p1 -b .gcc44
+%patch0 -p1 -b .fixcmake64
+find . -name '*.c' -exec chmod -x {} \;
+find . -name '*.cc' -exec chmod -x {} \;
+find . -name '*.cpp' -exec chmod -x {} \;
+find . -name '*.h' -exec chmod -x {} \;
%build
-# Required because patches modify .am files
-aclocal
-autoreconf -i
-# Broken: --enable-alsa --enable-sonartoranger --enable-lasertoranger
-find ./ -name '*.c' -exec chmod a-x {} \;
-find ./ -name '*.cc' -exec chmod a-x {} \;
-find ./ -name '*.cpp' -exec chmod a-x {} \;
-find ./ -name '*.h' -exec chmod a-x {} \;
-%configure --enable-playersd
-# Get rid of rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-# no smp flags, does not work properly: %{?_smp_mflags}
+%cmake -DBUILD_DOCUMENTATION=ON -DBUILD_PLAYERCC=ON -DBUILD_PLAYERCC_BOOST=ON -DBUILD_PYTHONC_BINDINGS=ON -DBUILD_PYTHONCPP_BINDINGS=ON -DBUILD_EXAMPLES=ON -DBUILD_RUBYCPP_BINDINGS=ON .
make
+
pushd doc
doxygen player.dox
popd
-
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-for f in `ls $RPM_BUILD_ROOT%{_bindir}/player*.py`; do mv $f $RPM_BUILD_ROOT%{_bindir}/`basename $f | awk -F. '{ print $1 }'`; done
-rm -rf $RPM_BUILD_ROOT%{_datadir}/player/java
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
+mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/config $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
-rm -f $RPM_BUILD_ROOT%{_bindir}/*.pyc
-rm -f $RPM_BUILD_ROOT%{_bindir}/*.pyo
-#mv $RPM_BUILD_ROOT%{_libdir}/player/examples $RPM_BUILD_ROOT%{_datadir}/player/examples
-
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
-mv $RPM_BUILD_ROOT%{_libdir}/liblododriver.so.?.?.? $RPM_BUILD_ROOT%{_libdir}/%{name}/liblododriver.so
-rm -rf $RPM_BUILD_ROOT%{_libdir}/liblododriver.so*
desktop-file-install --vendor="fedora" \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -164,30 +156,28 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING COPYING.lib README AUTHORS
-%config(noreplace) %{_sysconfdir}/player
+%{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/config/*
%{_bindir}/player*
%{_bindir}/pmaptest
%{_libdir}/*.so.*
%dir %{_datadir}/player
-%dir %{_libdir}/player
%{_datadir}/applications/*.desktop
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}
-%exclude %{_libdir}/player/examples
-
-%files python
-%defattr(-,root,root,-)
-%{python_sitearch}/*
%files devel
%defattr(-,root,root,-)
-%{_includedir}/player-2.1
+%{_includedir}/player-3.0
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
+%{_datadir}/cmake/Modules/*
+
+%files python
+%defattr(-,root,root,-)
+%{python_sitearch}/*
%files examples
%defattr(-,root,root,-)
-%{_libdir}/player/examples
+%{_datadir}/player/examples
%files doc
%defattr(-,root,root,-)
@@ -195,11 +185,24 @@ rm -rf $RPM_BUILD_ROOT
%doc doc/*.html
%doc doc/player-docs
-%files static
-%defattr(-,root,root,-)
-%{_libdir}/*.a
+%files ruby
+%defattr (-,root,root,-)
+%{_libdir}/ruby
%changelog
+* Sun Oct 18 2009 Tim Niemueller <tim at niemueller.de> - 3.0.0-3
+- Merge Rich's changes with Fedora spec file
+
+* Sat Oct 10 2009 Rich Mattes <richmattes at gmail.com> - 3.0.0-2
+- Fixed x86_64 build issues
+- Fixed x86_64 library install path
+- Fixed mock i586 and x86_64 dep issues
+- Enabled Python C++ and Ruby C++ bindings
+- Made doc and examples packages .noarch
+
+* Wed Oct 7 2009 Rich Mattes <richmattes at gmail.com> - 3.0.0-1
+- Upgrade package to Player 3.0.0
+
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.1-13
- rebuilt with new openssl
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 13 Aug 2008 09:07:33 -0000 1.2
+++ sources 5 Nov 2009 23:50:58 -0000 1.3
@@ -1 +1 @@
-74d221bebd7f68a8ef258aadf0ac185b player-2.1.1.tar.bz2
+5beee8655754559d5b80d9fcfbd3dd69 player-3.0.0.tar.gz
--- player-2.1.0rc2-paths.patch DELETED ---
--- player-2.1.1-gcc43.patch DELETED ---
--- player-2.1.1-gcc44.patch DELETED ---
--- player-2.1.1-norpath.patch DELETED ---
--- player-2.1.1-plugindir.patch DELETED ---
--- player-2.1.1-serialtypes.patch DELETED ---
More information about the fedora-extras-commits
mailing list