diff options
| -rw-r--r-- | rosgpt.spec | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/rosgpt.spec b/rosgpt.spec index 3d67dbc..39daf74 100644 --- a/rosgpt.spec +++ b/rosgpt.spec @@ -20,7 +20,9 @@ Source0: %{name}_%{version}.orig.tar.gz Requires: ros-%{ros_distro}-rclcpp Requires: ros-%{ros_distro}-sensor-msgs Requires: ros-%{ros_distro}-std-msgs +Requires: ros-%{ros_distro}-ros-workspace +BuildRequires: ros-%{ros_distro}-ros-workspace BuildRequires: ros-%{ros_distro}-rclcpp BuildRequires: ros-%{ros_distro}-sensor-msgs BuildRequires: ros-%{ros_distro}-std-msgs @@ -57,23 +59,7 @@ export ROS_PYTHON_VERSION=%{python3_version} # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. if [ -f "/opt/ros/%{ros_distro}/setup.sh" ]; then . "/opt/ros/%{ros_distro}/setup.sh"; fi mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform} -%cmake3 \ - -UINCLUDE_INSTALL_DIR \ - -ULIB_INSTALL_DIR \ - -USYSCONF_INSTALL_DIR \ - -USHARE_INSTALL_PREFIX \ - -ULIB_SUFFIX \ - -DCMAKE_INSTALL_PREFIX="/opt/ros/%{ros_distro}" \ - -DAMENT_PREFIX_PATH="/opt/ros/%{ros_distro}" \ - -DCMAKE_PREFIX_PATH="/opt/ros/%{ros_distro}" \ - -DCMAKE_INSTALL_LIBDIR="/opt/ros/%{ros_distro}/lib" \ - -DSETUPTOOLS_DEB_LAYOUT=OFF \ -%if !0%{?with_tests} - -DBUILD_TESTING=OFF \ -%endif - .. - -%make_build +%py3_build %install # Needed to bootstrap since the ros_workspace package does not yet exist. @@ -83,7 +69,7 @@ export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packa # in the install tree and source it. It will set things like # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. if [ -f "/opt/ros/%{ros_distro}/setup.sh" ]; then . "/opt/ros/%{ros_distro}/setup.sh"; fi -%make_install -C .obj-%{_target_platform} +%py3_install -- --prefix "/opt/ros/%{ros_distro}" %if 0%{?with_tests} %check |