已开启
将 fastcdr 升级至 1.0.29 #8
Wanming Hu创建于 25 天前
将 fastcdr 升级至 1.0.29 #8
已开启
共 2 个文件变更+15-10
| @@ -1,20 +1,23 @@ | |||
| 1 | -%bcond_without tests | 1 | +%bcond_with tests |
| 2 | %bcond_without weak_deps | 2 | %bcond_without weak_deps |
| 3 | 3 | ||
| 4 | +%define ros_distro humble | ||
| 5 | + | ||
| 6 | +%global debug_package %{nil} | ||
| 4 | %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') | 7 | %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') |
| 5 | %global __provides_exclude_from ^/opt/ros/%{ros_distro}/.*$ | 8 | %global __provides_exclude_from ^/opt/ros/%{ros_distro}/.*$ |
| 6 | %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$ | 9 | %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$ |
| 7 | 10 | ||
| 8 | %define RosPkgName fastcdr | 11 | %define RosPkgName fastcdr |
| 9 | -%define ros_distro humble | 12 | +%global SourceRoot Fast-CDR-%{version} |
| 10 | 13 | ||
| 11 | Name: ros-%{ros_distro}-%{RosPkgName} | 14 | Name: ros-%{ros_distro}-%{RosPkgName} |
| 12 | -Version: 1.0.24 | 15 | +Version: 1.0.29 |
| 13 | Release: 1%{?dist}%{?release_suffix} | 16 | Release: 1%{?dist}%{?release_suffix} |
| 14 | -Summary: CDR serialization implementation. | 17 | +Summary: ROS fastcdr package |
| 15 | 18 | ||
| 16 | -License: Apache License 2.0 | 19 | +License: Apache-2.0 |
| 17 | -Source0: %{name}_%{version}.orig.tar.gz | 20 | +Source0: %{RosPkgName}-%{version}.tar.gz |
| 18 | 21 | ||
| 19 | Requires: ros-%{ros_distro}-ros-workspace | 22 | Requires: ros-%{ros_distro}-ros-workspace |
| 20 | 23 | ||
| @@ -29,10 +32,10 @@ Provides: %{name}-doc = %{version}-%{release} | |||
| 29 | Provides: %{name}-runtime = %{version}-%{release} | 32 | Provides: %{name}-runtime = %{version}-%{release} |
| 30 | 33 | ||
| 31 | %description | 34 | %description |
| 32 | -CDR serialization implementation. | 35 | + |
| 33 | 36 | ||
| 34 | %prep | 37 | %prep |
| 35 | -%autosetup -p1 | 38 | +%autosetup -c -n %{SourceRoot} |
| 36 | 39 | ||
| 37 | %build | 40 | %build |
| 38 | # Needed to bootstrap since the ros_workspace package does not yet exist. | 41 | # Needed to bootstrap since the ros_workspace package does not yet exist. |
| @@ -56,7 +59,7 @@ mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform} | |||
| 56 | %if !0%{?with_tests} | 59 | %if !0%{?with_tests} |
| 57 | -DBUILD_TESTING=OFF \ | 60 | -DBUILD_TESTING=OFF \ |
| 58 | %endif | 61 | %endif |
| 59 | - .. | 62 | + ../%{SourceRoot} |
| 60 | 63 | ||
| 61 | %make_build | 64 | %make_build |
| 62 | 65 | ||
| @@ -77,7 +80,7 @@ export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packa | |||
| 77 | 80 | ||
| 78 | # Look for a Makefile target with a name indicating that it runs tests | 81 | # Look for a Makefile target with a name indicating that it runs tests |
| 79 | TEST_TARGET=$(%__make -qp -C .obj-%{_target_platform} | sed "s/^\(test\|check\):.*/\\1/;t f;d;:f;q0") | 82 | TEST_TARGET=$(%__make -qp -C .obj-%{_target_platform} | sed "s/^\(test\|check\):.*/\\1/;t f;d;:f;q0") |
| 80 | -if [ -n "$TEST_TARGET" ]; then | 83 | +if [ -n %{SourceRoot} ]; then |
| 81 | # In case we're installing to a non-standard location, look for a setup.sh | 84 | # In case we're installing to a non-standard location, look for a setup.sh |
| 82 | # in the install tree and source it. It will set things like | 85 | # in the install tree and source it. It will set things like |
| 83 | # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. | 86 | # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. |
| @@ -91,5 +94,7 @@ else echo "RPM TESTS SKIPPED"; fi | |||
| 91 | /opt/ros/%{ros_distro} | 94 | /opt/ros/%{ros_distro} |
| 92 | 95 | ||
| 93 | %changelog | 96 | %changelog |
| 97 | +* Mon Sep 21 2026 Wanming Hu <huwanming@huawei.com> - 1.0.29-1 | ||
| 98 | +- Upgrade fastcdr from 1.0.24 to 1.0.29 for ROS 2 Humble. | ||
| 94 | * Thu May 04 2023 Steven! Ragnarök stevenragnarok@osrfoundation.org - 1.0.24-1 | 99 | * Thu May 04 2023 Steven! Ragnarök stevenragnarok@osrfoundation.org - 1.0.24-1 |
| 95 | - Autogenerated by ros-porting-tools | 100 | - Autogenerated by ros-porting-tools |