[octomap] Initial import
rmattes
rmattes at fedoraproject.org
Tue Jul 1 02:34:43 UTC 2014
commit 5a8badff4633dccd5ab511693243d9fd748759f1
Author: Rich Mattes <richmattes at gmail.com>
Date: Mon Jun 30 22:34:36 2014 -0400
Initial import
.gitignore | 1 +
octomap-1.6.0-libdir.patch | 116 ++++++++++++++++++++++++++++++
octomap.spec | 166 ++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 284 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..a786374 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/octomap-1.6.6-6d85527.tar.gz
diff --git a/octomap-1.6.0-libdir.patch b/octomap-1.6.0-libdir.patch
new file mode 100644
index 0000000..c9448d8
--- /dev/null
+++ b/octomap-1.6.0-libdir.patch
@@ -0,0 +1,116 @@
+diff -up ./dynamicEDT3D/CMakeLists.txt.libdir ./dynamicEDT3D/CMakeLists.txt
+--- ./dynamicEDT3D/CMakeLists.txt.libdir 2014-05-26 05:20:16.000000000 -0400
++++ ./dynamicEDT3D/CMakeLists.txt 2014-06-09 22:00:40.089706266 -0400
+@@ -35,8 +35,8 @@ LINK_DIRECTORIES(${CMAKE_LIBRARY_OUTPUT_
+
+ set(INSTALL_TARGETS_DEFAULT_ARGS
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ LIBRARY DESTINATION lib${LIB_SUFFIX}
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ )
+
+ find_package(octomap REQUIRED
+@@ -85,7 +85,7 @@ configure_file(dynamicEDT3DConfig-versio
+ # Create a dynamicEDT3DConfig.cmake file for the use from the install tree
+ # and install it
+ set(DYNAMICEDT3D_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
+-set(DYNAMICEDT3D_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
++set(DYNAMICEDT3D_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+ #set(DYNAMICEDT3D_CMAKE_DIR "${INSTALL_DATA_DIR}/FooBar/CMake")
+ configure_file(dynamicEDT3DConfig.cmake.in
+ "${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig.cmake" @ONLY)
+@@ -94,7 +94,7 @@ configure_file(dynamicEDT3DConfig-versio
+ install(FILES
+ "${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig.cmake"
+ "${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig-version.cmake"
+- DESTINATION lib/cmake/dynamicEDT3D/)
++ DESTINATION lib${LIB_SUFFIX}/cmake/dynamicEDT3D/)
+
+ # Write pkgconfig-file:
+ include(InstallPkgConfigFile)
+diff -up ./dynamicEDT3D/CMakeModules/InstallPkgConfigFile.cmake.libdir ./dynamicEDT3D/CMakeModules/InstallPkgConfigFile.cmake
+--- ./dynamicEDT3D/CMakeModules/InstallPkgConfigFile.cmake.libdir 2014-06-09 22:02:03.235837230 -0400
++++ ./dynamicEDT3D/CMakeModules/InstallPkgConfigFile.cmake 2014-06-09 22:02:57.308881567 -0400
+@@ -63,7 +63,7 @@ function(install_pkg_config_file)
+ # write the .pc file out
+ file(WRITE ${pc_fname}
+ "prefix=${CMAKE_INSTALL_PREFIX}\n"
+- "libdir=\${prefix}/lib\n"
++ "libdir=\${prefix}/lib${LIB_SUFFIX}\n"
+ "includedir=\${prefix}/include\n"
+ "\n"
+ "Name: ${pc_name}\n"
+@@ -74,5 +74,5 @@ function(install_pkg_config_file)
+ "Cflags: -I\${includedir} ${pc_cflags}\n")
+
+ # mark the .pc file for installation to the lib/pkgconfig directory
+- install(FILES ${pc_fname} DESTINATION lib/pkgconfig)
++ install(FILES ${pc_fname} DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ endfunction(install_pkg_config_file)
+diff -up ./octomap/CMakeLists.txt.libdir ./octomap/CMakeLists.txt
+--- ./octomap/CMakeLists.txt.libdir 2014-05-26 05:20:16.000000000 -0400
++++ ./octomap/CMakeLists.txt 2014-06-09 22:00:40.089706266 -0400
+@@ -45,8 +45,8 @@ LINK_DIRECTORIES(${CMAKE_LIBRARY_OUTPUT_
+
+ set(INSTALL_TARGETS_DEFAULT_ARGS
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ LIBRARY DESTINATION lib${LIB_SUFFIX}
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ )
+
+ ADD_SUBDIRECTORY( src/math )
+@@ -92,7 +92,7 @@ configure_file(octomap-config-version.cm
+ # Create a octomap-config.cmake file for the use from the install tree
+ # and install it
+ set(OCTOMAP_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
+-set(OCTOMAP_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
++set(OCTOMAP_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+ #set(OCTOMAP_CMAKE_DIR "${INSTALL_DATA_DIR}/FooBar/CMake")
+ configure_file(octomap-config.cmake.in
+ "${PROJECT_BINARY_DIR}/InstallFiles/octomap-config.cmake" @ONLY)
+diff -up ./octomap/CMakeModules/InstallPkgConfigFile.cmake.libdir ./octomap/CMakeModules/InstallPkgConfigFile.cmake
+--- ./octomap/CMakeModules/InstallPkgConfigFile.cmake.libdir 2014-05-26 05:20:16.000000000 -0400
++++ ./octomap/CMakeModules/InstallPkgConfigFile.cmake 2014-06-09 22:00:40.089706266 -0400
+@@ -63,7 +63,7 @@ function(install_pkg_config_file)
+ # write the .pc file out
+ file(WRITE ${pc_fname}
+ "prefix=${CMAKE_INSTALL_PREFIX}\n"
+- "libdir=\${prefix}/lib\n"
++ "libdir=\${prefix}/lib${LIB_SUFFIX}\n"
+ "includedir=\${prefix}/include\n"
+ "\n"
+ "Name: ${pc_name}\n"
+@@ -74,5 +74,5 @@ function(install_pkg_config_file)
+ "Cflags: -I\${includedir} ${pc_cflags}\n")
+
+ # mark the .pc file for installation to the lib/pkgconfig directory
+- install(FILES ${pc_fname} DESTINATION lib/pkgconfig)
++ install(FILES ${pc_fname} DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ endfunction(install_pkg_config_file)
+diff -up ./octovis/CMakeLists.txt.libdir ./octovis/CMakeLists.txt
+--- ./octovis/CMakeLists.txt.libdir 2014-05-26 05:20:16.000000000 -0400
++++ ./octovis/CMakeLists.txt 2014-06-09 22:00:40.090706303 -0400
+@@ -43,8 +43,8 @@ export(PACKAGE octovis)
+
+ set(INSTALL_TARGETS_DEFAULT_ARGS
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ LIBRARY DESTINATION lib${LIB_SUFFIX}
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ )
+
+ # Builds the "octovis" viewer based on OpenGL and
+@@ -89,7 +89,7 @@ IF(BUILD_VIEWER)
+ # Create a octovis-config.cmake file for the use from the install tree
+ # and install it
+ set(OCTOVIS_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
+- set(OCTOVIS_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
++ set(OCTOVIS_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+ #set(OCTOMAP_CMAKE_DIR "${INSTALL_DATA_DIR}/FooBar/CMake")
+ configure_file(octovis-config.cmake.in
+ "${PROJECT_BINARY_DIR}/InstallFiles/octovis-config.cmake" @ONLY)
diff --git a/octomap.spec b/octomap.spec
new file mode 100644
index 0000000..434cf41
--- /dev/null
+++ b/octomap.spec
@@ -0,0 +1,166 @@
+%global commit 6d85527c3c1c50f52f3e591ba35154f0d1ff9cf8
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+Name: octomap
+Version: 1.6.6
+Release: 3%{?dist}
+Summary: Efficient Probabilistic 3D Mapping Framework Based on Octrees
+
+# octovis is GPLv2, octomap and dynamic-edt-3d are BSD
+License: BSD and GPLv2
+URL: http://octomap.github.io/
+Source0: https://github.com/OctoMap/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+# This patch adds the LIB_SUFFIX macro to all files that are installed to the library directory
+# Not submitted upstream
+Patch0: %{name}-1.6.0-libdir.patch
+
+BuildRequires: cmake
+BuildRequires: doxygen
+BuildRequires: ice-devel
+BuildRequires: libQGLViewer-devel
+BuildRequires: libXext-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: qt-devel
+
+%description
+The OctoMap library implements a 3D occupancy grid mapping approach,
+providing data structures and mapping algorithms in C++ particularly suited
+for robotics. The map implementation is based on an octree.
+
+%package devel
+Summary: Development files and libraries for %name
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+This package contains the header files and development libraries
+for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%package doc
+Summary: HTML Documentation for %{name}
+BuildArch: noarch
+
+%description doc
+This package contains doxygen-generated API documentation for %{name}
+
+%package octovis
+Summary: A visualization tool for Octomap
+
+%description octovis
+octovis is visualization tool for the OctoMap library based on Qt and
+libQGLViewer
+
+%package octovis-devel
+Summary: Development files and libraries for %{name}
+Requires: octomap-octovis%{?_isa} = %{version}-%{release}
+Requires: octomap-devel%{?_isa} = %{version}-%{release}
+
+%description octovis-devel
+This package contains the header files and development libraries
+for octovis. If you like to develop programs using octovis,
+you will need to install octovis-devel.
+
+%package -n dynamic-edt-3d
+Summary: Dynamic Euclidian Distance Transform Implementation
+
+%description -n dynamic-edt-3d
+The dynamicEDT3D library implements an incrementally updatable Euclidean
+distance transform (EDT) in 3D. It comes with a wrapper to use the OctoMap
+3D representation and hooks into the change detection of the OctoMap library
+to propagate changes to the EDT.
+
+%package -n dynamic-edt-3d-devel
+Summary: Development files and libraries for dynamic-edt-3d
+Requires: dynamic-edt-3d%{?_isa} = %{version}-%{release}
+Requires: octomap-devel%{?_isa} = %{version}-%{release}
+
+%description -n dynamic-edt-3d-devel
+This package contains the header files and development libraries
+for dynamic-edt-3d. If you like to develop programs using dynamic-edt-3d,
+you will need to install dynamic-edt-3d-devel.
+
+
+%prep
+%setup -q -n %{name}-%{commit}
+%patch0 -p0 -b .libdir
+
+%build
+mkdir build; pushd build
+%cmake .. -DCMAKE_SKIP_RPATH=ON
+make %{?_smp_mflags}
+make docs
+popd
+
+%install
+%make_install -C build
+rm -rf %{buildroot}%{_libdir}/*.a
+
+%check
+pushd build
+export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
+make test || cat Testing/Temporary/LastTest.log
+
+%post -p %{_sbindir}/ldconfig
+
+%postun -p %{_sbindir}/ldconfig
+
+%post -n %{name}-octovis -p %{_sbindir}/ldconfig
+
+%postun -n %{name}-octovis -p %{_sbindir}/ldconfig
+
+%post -n dynamic-edt-3d -p %{_sbindir}/ldconfig
+
+%postun -n dynamic-edt-3d -p %{_sbindir}/ldconfig
+
+%files
+%doc octomap/LICENSE.txt
+%exclude %{_bindir}/octovis
+%{_bindir}/*
+%{_libdir}/liboctomap.so.*
+%{_libdir}/liboctomath.so.*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*.xml
+
+%files devel
+%{_includedir}/octomap
+%{_libdir}/liboctomap.so
+%{_libdir}/liboctomath.so
+%{_libdir}/pkgconfig/octomap.pc
+%{_datadir}/%{name}/*.cmake
+
+%files doc
+%doc octomap/LICENSE.txt
+%doc octomap/doc/html
+
+%files octovis
+%doc octovis/LICENSE.txt
+%{_bindir}/octovis
+%{_libdir}/liboctovis.so.*
+%dir %{_datadir}/octovis
+%{_datadir}/octovis/*.xml
+
+%files octovis-devel
+%{_includedir}/octovis
+%{_libdir}/liboctovis.so
+%{_datadir}/octovis/*.cmake
+
+%files -n dynamic-edt-3d
+%doc dynamicEDT3D/LICENSE.txt
+%{_libdir}/libdynamicedt3d.so.*
+
+%files -n dynamic-edt-3d-devel
+%{_includedir}/dynamicEDT3D
+%{_libdir}/libdynamicedt3d.so
+%{_libdir}/pkgconfig/dynamicEDT3D.pc
+%{_libdir}/cmake
+
+%changelog
+* Fri Jun 27 2014 Rich Mattes <richmattes at gmail.com> - 1.6.6-3
+- Use sbindir macro
+
+* Sat Jun 21 2014 Rich Mattes <richmattes at gmail.com> - 1.6.6-2
+- Expand sub-package descriptions
+- Clean up package separation
+
+* Mon Jun 09 2014 Rich Mattes <richmattes at gmail.com> - 1.6.6-1
+- Initial build (rhbz#1107422)
diff --git a/sources b/sources
index e69de29..548d43b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+d276a4021c8247772b48c73c26d3d8b2 octomap-1.6.6-6d85527.tar.gz
More information about the scm-commits
mailing list