diff --git a/1.9.13-1.tar.gz b/1.9.13-1.tar.gz deleted file mode 100644 index baae09567ec0320cb4d7932e67b13f7ce074bbb3..0000000000000000000000000000000000000000 Binary files a/1.9.13-1.tar.gz and /dev/null differ diff --git a/angles.spec b/angles.spec index e33e57c49ae85eaded3cc2305f0da17b494f98a0..d5583fe565201c63e04429997ef54d3bb8d8a877 100644 --- a/angles.spec +++ b/angles.spec @@ -1,84 +1,107 @@ -Name: ros-noetic-ros-angles -Version: 1.9.13 -Release: 1 -Summary: This is ROS noetic %{name} Package -License: Public Domain and Apache-2.0 and BSD and MIT and BSL-1.0 -URL: https://github.com/ros-gbp/angles-release/archive/release/noetic/angles -Source0: https://github.com/ros-gbp/angles-release/archive/release/noetic/1.9.13-1.tar.gz -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: lz4-devel -BuildRequires: bzip2-devel -BuildRequires: python3-devel -BuildRequires: python3-setuptools +%bcond_without tests +%bcond_without weak_deps + +%global debug_package %{nil} +%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') +%global __provides_exclude_from ^/opt/ros/%{ros_distro}/.*$ +%global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$ + +%define RosPkgName angles + +Name: ros-%{ros_distro}-%{RosPkgName} +Version: 1.15.0 +Release: 1%{?dist}%{?release_suffix} +Summary: ROS angles package + +Url: http://wiki.ros.org/angles +License: BSD +Source0: %{name}_%{version}.orig.tar.gz + +Requires: ros-%{ros_distro}-ament-cmake +Requires: ros-%{ros_distro}-ros-workspace + +BuildRequires: ros-%{ros_distro}-ament-cmake +BuildRequires: ros-%{ros_distro}-ament-cmake-python +BuildRequires: python3-setuptools +BuildRequires: ros-%{ros_distro}-ros-workspace + +%if 0%{?with_tests} +%endif + +Provides: %{name}-devel = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +Provides: %{name}-runtime = %{version}-%{release} %description -This is %{name} Package +This package provides a set of simple math utilities to work + with angles. The utilities cover simple things like + normalizing an angle and conversion between degrees and + radians. But even if you're trying to calculate things like + the shortest angular distance between two joint space + positions of your robot, but the joint motion is constrained + by joint limits, this package is what you need. The code in + this package is stable and well tested. There are no plans for + major changes in the near future. %prep -%setup +%autosetup -p1 + +%build +# Needed to bootstrap since the ros_workspace package does not yet exist. +export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages + +# In case we're installing to a non-standard location, look for a setup.sh +# 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 +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}" \ + -DSETUPTOOLS_DEB_LAYOUT=OFF \ +%if !0%{?with_tests} + -DBUILD_TESTING=OFF \ +%endif + .. + +%make_build %install -cd 3rdparty/ - -cd empy-3.3.4/ -python3 setup.py install --user -cd .. - -cd six-1.15.0/ -python3 setup.py install --user -cd .. - -cd setuptools_scm-4.1.2/ -python3 setup.py install --user -cd .. - -cd python-dateutil-2.8.1/ -python3 setup.py install --user -cd .. - -cd pyparsing-2.4.7/ -python3 setup.py install --user -cd .. - -cd docutils-0.16/ -python3 setup.py install --user -cd .. - -cd catkin_pkg-0.4.22/ -python3 setup.py install --user -cd .. - -# 3rdparty -cd .. - -./src/catkin/bin/catkin_make_isolated --install -cp install_dependence.sh install_isolated/ - -#### -# 对install_isoloate内部的变量名称进行替换 -# -#### -SRC_PATH=$PWD/install_isolated -DST_PATH=/opt/ros/noetic -sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install_isolated/*` - -#### -# 添加.catkin和.rosinstall文件 -# -#### -mkdir -p %{buildroot}/opt/ros/noetic/ -mkdir -p %{buildroot}/usr/local/ -cp -r install_isolated/* %{buildroot}/opt/ros/noetic/ -cp install_isolated/.rosinstall %{buildroot}/opt/ros/noetic/ -cp install_isolated/.catkin %{buildroot}/opt/ros/noetic/ +# Needed to bootstrap since the ros_workspace package does not yet exist. +export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages + +# In case we're installing to a non-standard location, look for a setup.sh +# 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} + +%if 0%{?with_tests} +%check +# Needed to bootstrap since the ros_workspace package does not yet exist. +export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages + +# Look for a Makefile target with a name indicating that it runs tests +TEST_TARGET=$(%__make -qp -C .obj-%{_target_platform} | sed "s/^\(test\|check\):.*/\\1/;t f;d;:f;q0") +if [ -n "$TEST_TARGET" ]; then +# In case we're installing to a non-standard location, look for a setup.sh +# 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 +CTEST_OUTPUT_ON_FAILURE=1 \ + %make_build -C .obj-%{_target_platform} $TEST_TARGET || echo "RPM TESTS FAILED" +else echo "RPM TESTS SKIPPED"; fi +%endif %files -%defattr(-,root,root) -/opt/ros/noetic/* -/opt/ros/noetic/.rosinstall -/opt/ros/noetic/.catkin +/opt/ros/%{ros_distro} %changelog -* Tue Dec 15 2020 openEuler Buildteam - 1.9.13-1 -- Package init +* Thu May 04 2023 Tully Foote tfoote@osrfoundation.org - 1.15.0-1 +- Autogenerated by ros-porting-tools diff --git a/ros-humble-angles_1.15.0.orig.tar.gz b/ros-humble-angles_1.15.0.orig.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..2d61185a9b57d9fde3af8f029c837e0dcb67314d Binary files /dev/null and b/ros-humble-angles_1.15.0.orig.tar.gz differ