[ompl] Update to release 0.10.2
rmattes
rmattes at fedoraproject.org
Wed May 16 01:08:26 UTC 2012
commit f0ebce7371e8c37c4c6f37ca60545417cc8c6608
Author: Rich Mattes <richmattes at gmail.com>
Date: Tue May 15 21:08:08 2012 -0400
Update to release 0.10.2
.gitignore | 1 +
ompl-0.10.2-fedora.patch | 73 +++++++++++++++++++++++++++++++++++++++++++
ompl-0.9.3.fixinstall.patch | 12 -------
ompl-0.9.5.gcc47.patch | 14 --------
ompl.spec | 33 +++++++++++++------
sources | 2 +-
6 files changed, 97 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 27b3705..3d7f9e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/ompl-0.9.3-Source.tar.gz
/ompl-0.9.5-Source.tar.gz
+/ompl-0.10.2-Source.tar.gz
diff --git a/ompl-0.10.2-fedora.patch b/ompl-0.10.2-fedora.patch
new file mode 100644
index 0000000..96ea3d6
--- /dev/null
+++ b/ompl-0.10.2-fedora.patch
@@ -0,0 +1,73 @@
+diff -up ./CMakeLists.txt.fedora ./CMakeLists.txt
+--- ./CMakeLists.txt.fedora 2012-05-15 18:59:18.014694396 -0400
++++ ./CMakeLists.txt 2012-05-15 20:06:33.163674225 -0400
+@@ -80,10 +80,10 @@ if(NOT OMPL_IN_ROS)
+ set(PKG_OMPL_LIBS "-lompl")
+ set(pkg_conf_file "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/ompl.pc")
+ configure_file("${pkg_conf_file}.in" "${pkg_conf_file}" @ONLY)
+- install(FILES ${pkg_conf_file} DESTINATION lib/pkgconfig/ COMPONENT pkgconfig)
++ install(FILES ${pkg_conf_file} DESTINATION lib${LIB_SUFFIX}/pkgconfig/ COMPONENT pkgconfig)
+
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/dox/FindOMPL.cmake"
+- DESTINATION "share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/")
++ DESTINATION "share/cmake/Modules/")
+ endif()
+
+ # uninstall target
+diff -up ./src/CMakeLists.txt.fedora ./src/CMakeLists.txt
+--- ./src/CMakeLists.txt.fedora 2012-05-15 20:04:03.632175319 -0400
++++ ./src/CMakeLists.txt 2012-05-15 20:43:35.088625627 -0400
+@@ -8,7 +8,7 @@ install(DIRECTORY ompl DESTINATION inclu
+ REGEX "/doc$" EXCLUDE
+ REGEX "/tests$" EXCLUDE)
+
+-install(DIRECTORY external/omplext_odeint DESTINATION include)
++#install(DIRECTORY external/omplext_odeint DESTINATION include/ompl)
+
+ # Add target to install Py++ and its dependencies pygccxml and gccxml
+ # (This won't work on Windows, since there is no "patch" command.)
+@@ -16,14 +16,14 @@ set(PATCH_GCCXCML_DIFF "${CMAKE_CURRENT_
+ # This patch is for Windows, and includes the diff above, as well as another Windows specific change.
+ set(PATCH_GCCXML_SOURCE_READER "${CMAKE_CURRENT_SOURCE_DIR}/external/source_reader.py")
+ string(REPLACE "/" "\\" PATCH_GCCXML_SOURCE_READER ${PATCH_GCCXML_SOURCE_READER})
+-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.sh.in"
+- "${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.sh" @ONLY)
+-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.bat.in"
+- "${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.bat" @ONLY)
++#configure_file("${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.sh.in"
++# "${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.sh" @ONLY)
++#configure_file("${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.bat.in"
++# "${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.bat" @ONLY)
+ if(WIN32)
+ add_custom_target(installpyplusplus
+ COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.bat" VERBATIM)
+ else(WIN32)
+-add_custom_target(installpyplusplus
+- COMMAND "sh" "${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.sh")
++#add_custom_target(installpyplusplus
++# COMMAND "sh" "${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.sh")
+ endif(WIN32)
+diff -up ./src/ompl/CMakeLists.txt.fedora ./src/ompl/CMakeLists.txt
+--- ./src/ompl/CMakeLists.txt.fedora 2012-05-15 19:00:44.471992137 -0400
++++ ./src/ompl/CMakeLists.txt 2012-05-15 19:01:01.697644332 -0400
+@@ -76,7 +76,7 @@ else(OMPL_IN_ROS)
+ endif(OMPL_IN_ROS)
+
+ # install the library
+-install(TARGETS ompl DESTINATION lib/)
++install(TARGETS ompl DESTINATION lib${LIB_SUFFIX}/)
+ if(NOT MSVC)
+ get_target_property(OMPL_LIBRARY_LOC ompl LOCATION)
+ add_custom_command(TARGET ompl POST_BUILD
+diff -up ./src/ompl/tools/benchmark/src/MachineSpecs.cpp.fedora ./src/ompl/tools/benchmark/src/MachineSpecs.cpp
+--- ./src/ompl/tools/benchmark/src/MachineSpecs.cpp.fedora 2012-05-15 18:49:47.860902896 -0400
++++ ./src/ompl/tools/benchmark/src/MachineSpecs.cpp 2012-05-15 18:51:17.132141650 -0400
+@@ -36,7 +36,7 @@
+
+ #include "ompl/tools/benchmark/MachineSpecs.h"
+ #include "ompl/util/Console.h"
+-
++#include "unistd.h"
+ /// @cond IGNORE
+
+ #if defined _WIN32
diff --git a/ompl.spec b/ompl.spec
index 0c776c2..9f324a6 100644
--- a/ompl.spec
+++ b/ompl.spec
@@ -1,6 +1,6 @@
Name: ompl
-Version: 0.9.5
-Release: 4%{?dist}
+Version: 0.10.2
+Release: 1%{?dist}
Summary: The Open Motion Planning Library
Group: System Environment/Libraries
@@ -8,11 +8,10 @@ License: BSD
URL: http://ompl.kavrakilab.org/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-Source.tar.gz
# This patch adds LIB_SUFFIX to the library installation directory, so that
-# libraries get installed to /usr/lib64 on 64 bit systems.
+# libraries get installed to /usr/lib64 on 64 bit systems. It also
+# disables installation of the bundled boost odeint library
# Not yet submitted upstream
-Patch0: ompl-0.9.3.fixinstall.patch
-# Fixes for gcc 4.7 related build errors
-Patch1: ompl-0.9.5.gcc47.patch
+Patch0: ompl-0.10.2-fedora.patch
BuildRequires: boost-devel >= 1.42.0
BuildRequires: cmake >= 2.8.2
BuildRequires: doxygen
@@ -40,22 +39,30 @@ developing applications that use %{name}.
%prep
%setup -q -n %{name}-%{version}-Source
-%patch0 -p0 -b .fixinstalldir
-%patch1 -p0 -b .gcc47
+%patch0 -p0 -b .fedora
+
+# Remove bundled libraries (free - boost license)
+rm -rf src/external/*
+touch src/external/CMakeLists.txt
%build
# Python bindings are disabled because dependencies pygccxml and pyplusplus are not packaged for Fedora
-%cmake -DCMAKE_SKIP_RPATH=ON -DOMPL_BUILD_PYBINDINGS=OFF -DBOOST_LIBRARYDIR=%{_libdir} -DODE_LIB_PATH=%{_libdir}
+mkdir build
+cd build
+%cmake -DCMAKE_SKIP_RPATH=ON -DOMPL_BUILD_PYBINDINGS=OFF -DBOOST_LIBRARYDIR=%{_libdir} -DODE_LIB_PATH=%{_libdir} -DBUILD_OMPL_TESTS=ON -DOMPL_ODESOLVER=OFF ..
make %{?_smp_mflags}
make doc
rm -f doc/html/installdox
%install
-make install DESTDIR=%{buildroot}
+make -C build install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_datadir}/%{name}/demos/*.py
rm -rf %{buildroot}%{_includedir}/%{name}/CMakeFiles
+%check
+export LD_LIBRARY_PATH=$(pwd)/build/lib
+make -C build test
%post -p /sbin/ldconfig
@@ -73,9 +80,13 @@ rm -rf %{buildroot}%{_includedir}/%{name}/CMakeFiles
%{_libdir}/libompl.so
%{_includedir}/%{name}
%{_datadir}/%{name}
-
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/cmake/Modules/FindOMPL.cmake
%changelog
+* Tue May 15 2012 Rich Mattes <richmattes at gmail.com> - 0.10.2-1
+- Update to release 0.10.2
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-4
- Rebuilt for c++ ABI breakage
diff --git a/sources b/sources
index 44cb3d4..6b922af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d8553ff36ae7f248c98f38b4a52c858 ompl-0.9.5-Source.tar.gz
+2e7ad9780070b93916f1e695696fd185 ompl-0.10.2-Source.tar.gz
More information about the scm-commits
mailing list