summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--etsi-its-ivim-ts-conversion.spec14
-rw-r--r--sources2
3 files changed, 10 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index a7ef9f0..b726e26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/4e01c322a5634d95b85e5a0ad73fea563456c3ca.tar.gz
+/etsi-its-ivim-ts-conversion-3.5.0.tar.gz
diff --git a/etsi-its-ivim-ts-conversion.spec b/etsi-its-ivim-ts-conversion.spec
index 721e2b4..b5f1697 100644
--- a/etsi-its-ivim-ts-conversion.spec
+++ b/etsi-its-ivim-ts-conversion.spec
@@ -10,8 +10,10 @@ Release: 1%{?dist}
Summary: Conversion functions for converting ROS messages to and from ASN.1-encoded ETSI ITS IVIMs (TS)
License: MIT
URL: https://github.com/ika-rwth-aachen/etsi_its_messages
-# 归档解压根目录经实测为 etsi_its_messages-<full-sha>(非纯 SHA,已下载验证)
-Source0: https://github.com/ika-rwth-aachen/etsi_its_messages/archive/%{commit}.tar.gz
+# 本地 --transform 重打 tarball,内部根目录 = etsi-its-ivim-ts-conversion-<version>
+# #/ 片段让 RPM 用本地 tarball 而非下载 GitHub 原始包(原始包内部目录为 etsi_its_messages-<sha>,
+# 与 %%autosetup -n 不匹配导致 %%prep cd 失败)
+Source0: https://github.com/ika-rwth-aachen/etsi_its_messages/archive/%{commit}.tar.gz#/etsi-its-ivim-ts-conversion-%{version}.tar.gz
# debug 子包无意义(/opt 前缀,strip/debugedit 路径非常规),SIG 模板统一关闭
%global debug_package %{nil}
@@ -53,7 +55,7 @@ This package provides header-only INTERFACE library for IVIM (TS) message
conversion as part of the etsi_its_messages stack.
%prep
-%autosetup -n etsi_its_messages-%{commit}
+%autosetup -n etsi-its-ivim-ts-conversion-%{version}
%build
# ROS 基座环境 bootstrap(setup.sh 可能不存在,用 [ -f ] 守卫)
@@ -63,7 +65,7 @@ export PKG_CONFIG_PATH=/opt/ros/%{ros_distro}/lib/pkgconfig${PKG_CONFIG_PATH:+:$
# 包位于 monorepo 子目录 etsi_its_conversion/etsi_its_ivim_ts_conversion
cd etsi_its_conversion/etsi_its_ivim_ts_conversion
-# 显式 out-of-source 构建(避免 openEuler %cmake 宏位置参数坑)
+# 显式 out-of-source 构建(避免 openEuler %%cmake 宏位置参数坑)
mkdir -p build && cd build
cmake .. \
-DCMAKE_INSTALL_PREFIX="/opt/ros/%{ros_distro}" \
@@ -80,12 +82,12 @@ make %{?_smp_mflags}
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}
-# 进入 %build 创建的 build 子目录执行安装
+# 进入 %%build 创建的 build 子目录执行安装
cd etsi_its_conversion/etsi_its_ivim_ts_conversion/build
make install DESTDIR=%{buildroot}
%files
-# %files 整树拥有,对「装了没打包」类错误免疫(SIG 模板标准做法)
+# %%files 整树拥有,对「装了没打包」类错误免疫(SIG 模板标准做法)
/opt/ros/%{ros_distro}
%changelog
diff --git a/sources b/sources
index 3fb101b..165a59e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29940efed6cc686189401d6d03d2f8ac 4e01c322a5634d95b85e5a0ad73fea563456c3ca.tar.gz
+2bc55732634dbfaaba9f6b227d6f9df8 etsi-its-ivim-ts-conversion-3.5.0.tar.gz