automatic import of ros-humble-easynav-simple-commonopeneuler24.03_LTS_SP3

2 files changed, 11 insertions, 7 deletions

diff --git a/easynav-simple-common.spec b/easynav-simple-common.spec
index b69f83e..1cd8543 100644
--- a/easynav-simple-common.spec
+++ b/easynav-simple-common.spec
@@ -30,10 +30,11 @@ License:        Apache-2.0
 URL:            https://github.com/EasyNavigation/easynav_plugins
 # 实际检出 commit（ros_fetch checkout humble 分支 HEAD），用于产物追溯
 %global commit 2580d29baefe77305c6e9336dca743aa5ce51c2c
-# 强制重定向（spec-rules-ros.md §2 选项2）：URL 的 #/ 后缀把 Source0 落地文件名
-# 统一为 RosPkgName-version.tar.gz，配合 build-rpm skill §4 的 tar --transform
-# （重命名源码根为该目录名）；autosetup -n 即用该目录名——非臆测上游归档解压根目录。
-Source0:        https://github.com/EasyNavigation/easynav_plugins/archive/%{commit}.tar.gz#/%{RosPkgName}-%{version}.tar.gz
+# GitHub commit 归档解压根目录 = easynav_plugins-<full-sha>（实测 tar tzf 确认），
+# 直接用归档原生目录名，不依赖 build-rpm skill §4 的 tar --transform——
+# submit_fix.py 的 transform 前缀取 gate_result version（含 release 号
+# 0.5.0-1），与 spec 的 %%autosetup -n（仅 0.5.0）不一致会导致 %%prep cd 失败。
+Source0:        https://github.com/EasyNavigation/easynav_plugins/archive/%{commit}.tar.gz
 
 # /opt 前缀下 debug 子包无意义（strip/debugedit 路径非常规），统一关闭
 %global debug_package %{nil}
@@ -81,8 +82,8 @@ common code for the EasyNav plugin family, built as an ament_cmake ROS 2
 component installed under /opt/ros/%{ros_distro}.
 
 %prep
-# 强制重定向目录名（配合 build-rpm skill §4 --transform，非臆测上游归档名）
-%autosetup -n %{RosPkgName}-%{version}
+# GitHub commit 归档原生根目录（实测确认：<repo>-<full-sha>），不依赖 transform
+%autosetup -n easynav_plugins-%{commit}
 
 %build
 # ROS 基座环境（chroot 可能未装 setup.sh，用 [ -f ] 守卫——|| true 挡不住严格 sh）
@@ -118,6 +119,9 @@ cd common/easynav_simple_common/.obj
 
 %changelog
 * Tue Oct 20 2026 AI Importer <ai-importer@opencode.local> - 0.5.0-1
+- Fix %prep: use GitHub archive native root dir (easynav_plugins-<commit>)
+  instead of relying on tar --transform redirect (fix build 113764 %prep cd failure
+  caused by gate version 0.5.0-1 vs spec -n 0.5.0 mismatch)
 - Initial RPM package for easynav_simple_common (ROS 2 humble)
 - Generated from EasyNavigation/easynav_plugins humble branch (commit 2580d29)
 - ament_cmake build type; installs under /opt/ros/humble
diff --git a/sources b/sources
index 0be3007..f4367cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39096cebcc9d44327c35480db2a7f3d7  easynav-simple-common-0.5.0.tar.gz
+773ef140f812591a999924f42d21f81f  2580d29baefe77305c6e9336dca743aa5ce51c2c.tar.gz