diff --git a/gen-pkg-spec.sh b/gen-pkg-spec.sh
index a749b4fef8692d09c3a2e5ee9ba4a3af8dcc63db..dc94ed959eab145c2f2e3a0b5a58d96f6fd8485d 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/no-debuginfo b/spec_fix/no-debuginfo
index ccb42ca57436225f6eed60501ccc2a6ee8a9bfe6..ee0905179267ff0d1a67af5bffa38f268f791d75 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
diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap
index 25ae61b60305a9edab0934ed96f60e67e74d697d..59d9681c214b599639ad9115293f21fed536dd6c 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
diff --git a/spec_fix/spec-type-fix b/spec_fix/spec-type-fix
index ca7b56faf8c0b922092f8cd97a32e5e273f61513..8b137891791fe96927ad78e64b0aad7bded08bdc 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
+