diff --git a/.gitignore b/.gitignore index 2495ee2..1880afb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /ompl-0.9.5-Source.tar.gz /ompl-0.10.2-Source.tar.gz /ompl-0.11.1-Source.tar.gz +/ompl-0.12.2-Source.tar.gz diff --git a/ompl-0.11.1-fedora.patch b/ompl-0.11.1-fedora.patch deleted file mode 100644 index 8208bf8..0000000 --- a/ompl-0.11.1-fedora.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up ./ompl-0.11.1-Source/CMakeLists.txt.fedora ./ompl-0.11.1-Source/CMakeLists.txt ---- ./ompl-0.11.1-Source/CMakeLists.txt.fedora 2012-07-26 10:16:30.000000000 -0400 -+++ ./ompl-0.11.1-Source/CMakeLists.txt 2012-08-06 12:50:34.163944174 -0400 -@@ -27,6 +27,8 @@ set(OMPL_DEMO_INSTALL_DIR "share/ompl${O - CACHE STRING "Relative path to directory where demos will be installed") - set(OMPL_DOC_INSTALL_DIR "share/ompl${OMPL_INSTALL_SUFFIX}/doc" - CACHE STRING "Relative path to directory where documentation will be installed") -+set(OMPL_LIB_INSTALL_DIR "lib" -+ CACHE STRING "Relative path to directory where libraries will be installed") - - include_directories("${OMPL_INCLUDE_DIR}") - -@@ -80,7 +82,7 @@ if (NOT MSVC) - 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/ -+ install(FILES ${pkg_conf_file} DESTINATION ${OMPL_LIB_INSTALL_DIR}/pkgconfig/ - COMPONENT pkgconfig RENAME "ompl${OMPL_INSTALL_SUFFIX}.pc") - - install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/dox/FindOMPL.cmake" -diff -up ./ompl-0.11.1-Source/src/CMakeLists.txt.fedora ./ompl-0.11.1-Source/src/CMakeLists.txt ---- ./ompl-0.11.1-Source/src/CMakeLists.txt.fedora 2012-08-06 12:54:27.446819515 -0400 -+++ ./ompl-0.11.1-Source/src/CMakeLists.txt 2012-08-06 12:54:36.941560225 -0400 -@@ -8,7 +8,7 @@ install(DIRECTORY ompl/ DESTINATION "inc - REGEX "/doc$" EXCLUDE - REGEX "/tests$" EXCLUDE) - --install(DIRECTORY external/omplext_odeint/ DESTINATION "include/omplext_odeint${OMPL_INSTALL_SUFFIX}") -+install(DIRECTORY external/omplext_odeint/ DESTINATION "include/ompl/omplext_odeint${OMPL_INSTALL_SUFFIX}") - - # Add target to install Py++ and its dependencies pygccxml and gccxml - if (APPLE) -diff -up ./ompl-0.11.1-Source/src/ompl/CMakeLists.txt.fedora ./ompl-0.11.1-Source/src/ompl/CMakeLists.txt ---- ./ompl-0.11.1-Source/src/ompl/CMakeLists.txt.fedora 2012-07-26 10:16:30.000000000 -0400 -+++ ./ompl-0.11.1-Source/src/ompl/CMakeLists.txt 2012-08-06 12:50:34.163944174 -0400 -@@ -68,7 +68,7 @@ else(MSVC) - endif(MSVC) - - # install the library --install(TARGETS ompl DESTINATION lib/) -+install(TARGETS ompl DESTINATION ${OMPL_LIB_INSTALL_DIR}) - if(NOT MSVC) - get_target_property(OMPL_LIBRARY_LOC ompl LOCATION) - add_custom_command(TARGET ompl POST_BUILD diff --git a/ompl-0.12.2-fedora.patch b/ompl-0.12.2-fedora.patch new file mode 100644 index 0000000..f9fc6ae --- /dev/null +++ b/ompl-0.12.2-fedora.patch @@ -0,0 +1,104 @@ +diff -up ./CMakeLists.txt.fedora ./CMakeLists.txt +--- ./CMakeLists.txt.fedora 2013-01-04 15:27:27.000000000 -0500 ++++ ./CMakeLists.txt 2013-04-28 15:36:30.142515962 -0400 +@@ -27,6 +27,8 @@ set(OMPL_DEMO_INSTALL_DIR "share/ompl${O + CACHE STRING "Relative path to directory where demos will be installed") + set(OMPL_DOC_INSTALL_DIR "share/ompl${OMPL_INSTALL_SUFFIX}/doc" + CACHE STRING "Relative path to directory where documentation will be installed") ++set(OMPL_LIB_INSTALL_DIR "lib" ++ CACHE STRING "Relative path to directory where libraries will be installed") + + include_directories("${OMPL_INCLUDE_DIR}") + +@@ -90,7 +92,7 @@ if (NOT MSVC) + 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/ ++ install(FILES ${pkg_conf_file} DESTINATION ${OMPL_LIB_INSTALL_DIR}/pkgconfig/ + COMPONENT pkgconfig RENAME "ompl${OMPL_INSTALL_SUFFIX}.pc") + + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/dox/FindOMPL.cmake" +diff -up ./src/CMakeLists.txt.fedora ./src/CMakeLists.txt +--- ./src/CMakeLists.txt.fedora 2012-12-24 22:31:08.000000000 -0500 ++++ ./src/CMakeLists.txt 2013-05-01 18:46:03.022924794 -0400 +@@ -8,7 +8,7 @@ install(DIRECTORY ompl/ DESTINATION "inc + REGEX "/doc$" EXCLUDE + REGEX "/tests$" EXCLUDE) + +-install(DIRECTORY external/omplext_odeint/ DESTINATION "include/omplext_odeint${OMPL_INSTALL_SUFFIX}") ++#install(DIRECTORY external/omplext_odeint/ DESTINATION "include/ompl/omplext_odeint${OMPL_INSTALL_SUFFIX}") + + # Add target to install Py++ and its dependencies pygccxml and gccxml + if (APPLE) +diff -up ./src/ompl/CMakeLists.txt.fedora ./src/ompl/CMakeLists.txt +--- ./src/ompl/CMakeLists.txt.fedora 2013-01-15 15:57:56.000000000 -0500 ++++ ./src/ompl/CMakeLists.txt 2013-04-28 15:36:30.142515962 -0400 +@@ -68,7 +68,7 @@ else(MSVC) + endif(MSVC) + + # install the library +-install(TARGETS ompl DESTINATION lib/) ++install(TARGETS ompl DESTINATION ${OMPL_LIB_INSTALL_DIR}) + if(NOT MSVC) + get_target_property(OMPL_LIBRARY_LOC ompl LOCATION) + add_custom_command(TARGET ompl POST_BUILD +diff -up ./src/ompl/control/ODESolver.h.fedora ./src/ompl/control/ODESolver.h +--- ./src/ompl/control/ODESolver.h.fedora 2013-05-01 18:46:48.511731462 -0400 ++++ ./src/ompl/control/ODESolver.h 2013-05-01 18:47:41.385832376 -0400 +@@ -49,7 +49,7 @@ + #include "ompl/util/Console.h" + #include "ompl/util/ClassForward.h" + +-#include ++#include + #include + #include + #include +@@ -193,7 +193,7 @@ namespace ompl + /// Solver is the numerical integration method used to solve the equations. The default + /// is a fourth order Runge-Kutta method. This class wraps around the simple stepper + /// concept from boost::numeric::odeint. +- template > ++ template > + class ODEBasicSolver : public ODESolver + { + public: +@@ -211,7 +211,7 @@ namespace ompl + { + Solver solver; + ODESolver::ODEFunctor odefunc (ode_, control); +- boost::numeric::omplext_odeint::integrate_const (solver, odefunc, state, 0.0, duration, intStep_); ++ boost::numeric::odeint::integrate_const (solver, odefunc, state, 0.0, duration, intStep_); + } + }; + +@@ -221,7 +221,7 @@ namespace ompl + /// Solver is the numerical integration method used to solve the equations. The default + /// is a fifth order Runge-Kutta Cash-Karp method with a fourth order error bound. + /// This class wraps around the error stepper concept from boost::numeric::odeint. +- template > ++ template > + class ODEErrorSolver : public ODESolver + { + public: +@@ -268,7 +268,7 @@ namespace ompl + /// Solver is the numerical integration method used to solve the equations, and must implement + /// the error stepper concept from boost::numeric::odeint. The default + /// is a fifth order Runge-Kutta Cash-Karp method with a fourth order error bound. +- template > ++ template > + class ODEAdaptiveSolver : public ODESolver + { + public: +@@ -312,8 +312,8 @@ namespace ompl + { + ODESolver::ODEFunctor odefunc (ode_, control); + +- boost::numeric::omplext_odeint::controlled_runge_kutta< Solver > solver (boost::numeric::omplext_odeint::default_error_checker(maxError_, maxEpsilonError_)); +- boost::numeric::omplext_odeint::integrate_adaptive (solver, odefunc, state, 0.0, duration, intStep_); ++ boost::numeric::odeint::controlled_runge_kutta< Solver > solver (boost::numeric::odeint::default_error_checker(maxError_, maxEpsilonError_)); ++ boost::numeric::odeint::integrate_adaptive (solver, odefunc, state, 0.0, duration, intStep_); + } + + /// \brief The maximum error allowed when performing numerical integration diff --git a/ompl.spec b/ompl.spec index e6c0832..4ea6911 100644 --- a/ompl.spec +++ b/ompl.spec @@ -1,6 +1,6 @@ Name: ompl -Version: 0.11.1 -Release: 4%{?dist} +Version: 0.12.2 +Release: 1%{?dist} Summary: The Open Motion Planning Library Group: System Environment/Libraries @@ -11,7 +11,7 @@ Source0: https://bitbucket.org/%{name}/%{name}/downloads/%{name}-%{versio # libraries get installed to /usr/lib64 on 64 bit systems. It also # moves the installation directory of the odeint library # Not yet submitted upstream -Patch0: ompl-0.11.1-fedora.patch +Patch0: ompl-0.12.2-fedora.patch BuildRequires: boost-devel >= 1.42.0 BuildRequires: cmake >= 2.8.2 BuildRequires: doxygen @@ -30,7 +30,8 @@ collision checker or visualization front end. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: boost-devel %description devel The %{name}-devel package contains libraries and header files for @@ -39,7 +40,9 @@ developing applications that use %{name}. %prep %setup -q -n %{name}-%{version}-Source -%patch0 -p2 -b .fedora +%patch0 -p0 -b .fedora +# Get rid of bundled odeint +rm -rf src/external/omplext_odeint/ %build # Python bindings are disabled because dependencies pygccxml and pyplusplus are not packaged for Fedora @@ -90,6 +93,10 @@ rm -rf %{buildroot}%{_bindir} %{_datadir}/cmake/Modules/FindOMPL.cmake %changelog +* Wed May 01 2013 Rich Mattes - 0.12.2-1 +- Update to release 0.12.2 +- Remove bundled odeint + * Sun Feb 10 2013 Denis Arnaud - 0.11.1-4 - Rebuild for Boost-1.53.0 diff --git a/sources b/sources index 92cd5bc..a605162 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -235ca56932ff20da0c01f8201657740a ompl-0.11.1-Source.tar.gz +0415337bf4e4dc314a36dcf2d44845ca ompl-0.12.2-Source.tar.gz