summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--lanelet2-core.spec17
-rw-r--r--sources2
3 files changed, 13 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index e4af1de..b8e1629 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/lanelet2-core-1.2.3-1.tar.gz
+/lanelet2-core-1.1.1.tar.gz
diff --git a/lanelet2-core.spec b/lanelet2-core.spec
index 346b40f..1152eca 100644
--- a/lanelet2-core.spec
+++ b/lanelet2-core.spec
@@ -1,9 +1,9 @@
%define ros_distro humble
%define RosPkgName lanelet2-core
-%define src_version 1.2.3-1
+%define src_version 1.1.1
Name: ros-%{ros_distro}-%{RosPkgName}
-Version: 1.2.3
+Version: 1.1.1
Release: 1%{?dist}
Summary: Lanelet2 core module
License: BSD
@@ -38,9 +38,11 @@ Lanelet2 core module
%autosetup -n %{RosPkgName}-%{src_version}
%build
-source /opt/ros/%{ros_distro}/setup.sh 2>/dev/null || true
+[ -f /opt/ros/%{ros_distro}/setup.sh ] && source /opt/ros/%{ros_distro}/setup.sh || true
export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages${PYTHONPATH:+:$PYTHONPATH}
export PKG_CONFIG_PATH=/opt/ros/%{ros_distro}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+# rospkg OsDetect 不识别 openEuler,用 rhel 兜底让 mrt_cmake_modules 正常解析依赖
+export ROS_OS_OVERRIDE=rhel:8:final
cd lanelet2_core
mkdir -p .obj && cd .obj
%cmake3 \
@@ -54,9 +56,10 @@ mkdir -p .obj && cd .obj
make %{?_smp_mflags}
%install
-source /opt/ros/%{ros_distro}/setup.sh 2>/dev/null || true
+[ -f /opt/ros/%{ros_distro}/setup.sh ] && source /opt/ros/%{ros_distro}/setup.sh || true
export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages${PYTHONPATH:+:$PYTHONPATH}
export PKG_CONFIG_PATH=/opt/ros/%{ros_distro}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+export ROS_OS_OVERRIDE=rhel:8:final
cd lanelet2_core
cd .obj
make install DESTDIR=%{buildroot}
@@ -65,5 +68,7 @@ make install DESTDIR=%{buildroot}
/opt/ros/%{ros_distro}
%changelog
-* Sat Sep 19 2026 ai-importer <ai-importer@openeuler.org> - 1.2.3-1
-- Initial import (ROS batch)
+* Mon Oct 12 2026 ai-importer <ai-importer@openeuler.org> - 1.1.1-1
+- Rebase to 1.1.1 (ROS batch import)
+* Sun Sep 20 2026 ai-importer <ai-importer@openeuler.org> - 1.2.3-1
+- Initial import (ROS batch) \ No newline at end of file
diff --git a/sources b/sources
index c6e1523..e0648dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c14829fb71a5a70404169ca717b6959 lanelet2-core-1.2.3-1.tar.gz
+1995e6bd00aef504d98830017578cd60 lanelet2-core-1.1.1.tar.gz