--- ros.spec.orig 2012-05-30 11:51:02.129027589 +0100 +++ ros.spec 2012-05-30 11:56:42.234019124 +0100 @@ -37,10 +37,16 @@ Patch1: ros-fuerte-destdir-fix.patch # Rename xmlrpcpp files (and subdir the include files) to make it clear that it is a ROS # specific fork Patch2: ros-fuerte-xmlrpcpp-fork.patch -BuildRequires: cmake, python-setuptools-devel +%if (0%{?rhel} <= 6) +BuildRequires: cmake28 +%else +BuildRequires: cmake +%endif +BuildRequires: python-setuptools-devel BuildRequires: boost-devel, gtest-devel, tinyxml-devel BuildRequires: bzip2-devel, python-nose, apr-devel BuildRequires: python-paramiko, PyYAML, python-empy +BuildRequires: log4cxx-devel %description ROS is an open-source, meta-operating system for your robot. It provides the @@ -291,7 +297,12 @@ Development files for ROS std_msgs. Summary: A cmake based build system Version: %{catkinversion} BuildArch: noarch -Requires: cmake, python-setuptools, python-argparse, python-empy +%if (0%{?rhel} <= 6) +Requires: cmake28 +%else +Requires: cmake +%endif +Requires: python-setuptools, python-argparse, python-empy Requires: python-yaml, python-nose, gtest %description -n catkin @@ -315,7 +326,12 @@ rm -rf rospack/tinyxml-2.5.3 export DESTDIR=%{buildroot} mkdir build cd build -%cmake -DSETUPTOOLS_DEB_LAYOUT=OFF .. +%if (0%{?rhel} <= 6) +%{cmake28} .. \ +%else +%{cmake} .. \ +%endif + -DSETUPTOOLS_DEB_LAYOUT=OFF .. make %{?_smp_mflags} %install