From 72a58d7b01c66d07ec8c1c5b93ad4235c8de4820 Mon Sep 17 00:00:00 2001
From: will_niutao <niutao2@huawei.com>
Date: Tue, 9 May 2023 09:06:58 +0800
Subject: [PATCH 1/3] fix: fix no debuginfo build error

---
 spec_fix/no-debuginfo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec_fix/no-debuginfo b/spec_fix/no-debuginfo
index ccb42ca..ee09051 100644
--- a/spec_fix/no-debuginfo
+++ b/spec_fix/no-debuginfo
@@ -8,3 +8,5 @@ fluent-rviz
 dataspeed-can-msg-filters
 dataspeed-dbw-common
 rosbag2-performance-benchmarking
+ecl-build
+quaternion-operation
-- 
Gitee


From 832dc89c458033e184067cd5cbef4c1bde4f5dba Mon Sep 17 00:00:00 2001
From: will_niutao <niutao2@huawei.com>
Date: Tue, 9 May 2023 17:49:48 +0800
Subject: [PATCH 2/3] fix: remap libomp-dev to libomp-devel

Signed-off-by: will_niutao <niutao2@huawei.com>
---
 spec_fix/pkg.remap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap
index 25ae61b..59d9681 100644
--- a/spec_fix/pkg.remap
+++ b/spec_fix/pkg.remap
@@ -105,3 +105,4 @@ libdbus-dev dbus-devel
 libbluetooth-dev bluez-devel
 libjsoncpp-dev jsoncpp-devel
 python3-pil python3-pillow
+libomp-dev libomp-devel
-- 
Gitee


From 1ed7943f44db30acf87d9a20f2649f0e9fd7f1c2 Mon Sep 17 00:00:00 2001
From: will_niutao <niutao2@huawei.com>
Date: Wed, 10 May 2023 14:29:51 +0800
Subject: [PATCH 3/3] fix(gen-pkg-spec): fix package build type

---
 gen-pkg-spec.sh        |  6 +++---
 spec_fix/spec-type-fix | 19 +------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/gen-pkg-spec.sh b/gen-pkg-spec.sh
index a749b4f..dc94ed9 100755
--- a/gen-pkg-spec.sh
+++ b/gen-pkg-spec.sh
@@ -294,11 +294,11 @@ main()
                 		pkg_dir_name=`cd ${ROS_SRC_BASE}/${repo} && ls ros-${ROS_DISTRO}-${pkg}_*.orig.tar.gz | sed -e "s#.orig.tar.gz##g" | sed -e "s#_#-#g"`
                 		pkg_tar=`cd ${ROS_SRC_BASE}/${repo} && ls ros-${ROS_DISTRO}-${pkg}_*.orig.tar.gz`
 				cp ${ROS_SRC_BASE}/${repo}/$pkg_tar ${ROS_REPO_BASE}/$repo/
-                        	if [ -f ${ROS_SRC_BASE}/${repo}/${pkg_dir_name}/setup.py ]
+                        	if [ -f ${ROS_SRC_BASE}/${repo}/${pkg_dir_name}/CMakeLists.txt ]
                         	then
-                        	        cp ${ROOT}/template/py-ubuntu.spec $pkg.spec
-                        	else
                         	        cp ${ROOT}/template/cmake-ubuntu.spec $pkg.spec
+                        	else
+                        	        cp ${ROOT}/template/py-ubuntu.spec $pkg.spec
                         	fi
 
 				pkg_dir_name=${ROS_SRC_BASE}/${repo}/$pkg_dir_name
diff --git a/spec_fix/spec-type-fix b/spec_fix/spec-type-fix
index ca7b56f..8b13789 100644
--- a/spec_fix/spec-type-fix
+++ b/spec_fix/spec-type-fix
@@ -1,18 +1 @@
-angles cmake
-message-filters cmake
-pal-statistics cmake
-resource-retriever cmake
-dataspeed-ulc-can cmake
-simple-actions cmake
-neo-simulation2 cmake
-camera-calibration-parsers cmake
-rqt-image-overlay cmake
-ruckig cmake
-rtabmap-ros cmake
-python-qt-binding cmake
-qt-gui-py-common cmake
-qt-dotgraph cmake
-qt-gui-cpp cmake
-rqt-image-view cmake
-geodesy cmake
-moveit-core cmake
+
-- 
Gitee