diff --git a/create-graph-deps-for-check-list.sh b/create-graph-deps-for-check-list.sh
index fedc03523798166c0f7202a75d96d0d67a37df79..a2957a3c5ac5b142a9f517a9061eb038eda4eaa7 100755
--- a/create-graph-deps-for-check-list.sh
+++ b/create-graph-deps-for-check-list.sh
@@ -82,7 +82,7 @@ main()
 			continue
 		fi
 
-		s=`grep "${project}.spec" ${OUTPUT}/.all_spec`
+		s=`grep "${project}.spec" .all_spec`
 
 		[ "$s" == "" ] && continue
 		cp $s ${ROS_GRAPH_BASE}
diff --git a/package_fix/console-bridge-vendor/0-console-bridge-vendor-change-cmake-download.patch b/package_fix/console-bridge-vendor/0-console-bridge-vendor-change-cmake-download.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c808e4ab691f414a99cc12a4926efa9cefd2a37a
--- /dev/null
+++ b/package_fix/console-bridge-vendor/0-console-bridge-vendor-change-cmake-download.patch
@@ -0,0 +1,12 @@
+diff -Naur ros-humble-console-bridge-vendor-1.4.1_org/CMakeLists.txt ros-humble-console-bridge-vendor-1.4.1/CMakeLists.txt
+--- ros-humble-console-bridge-vendor-1.4.1_org/CMakeLists.txt	2023-04-26 16:01:55.653557871 +0800
++++ ros-humble-console-bridge-vendor-1.4.1/CMakeLists.txt	2023-04-26 16:03:50.311237487 +0800
+@@ -71,7 +71,7 @@
+ 
+   # Download and build console_bridge
+   externalproject_add(console_bridge-1.0.2
+-    URL https://github.com/ros/console_bridge/archive/1.0.2.tar.gz
++    URL ${CMAKE_CURRENT_SOURCE_DIR}/1.0.2.tar.gz
+     URL_HASH SHA256=303a619c01a9e14a3c82eb9762b8a428ef5311a6d46353872ab9a904358be4a4
+     TIMEOUT 600
+     CMAKE_ARGS
diff --git a/package_fix/console-bridge-vendor/1.0.2.tar.gz b/package_fix/console-bridge-vendor/1.0.2.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..0b181debcd959da853369b7e1ac0ed1d5f2c7159
Binary files /dev/null and b/package_fix/console-bridge-vendor/1.0.2.tar.gz differ
diff --git a/package_fix/console-bridge-vendor/prep.fix b/package_fix/console-bridge-vendor/prep.fix
new file mode 100644
index 0000000000000000000000000000000000000000..f5881bc920fe62c102d3779689c602c1bc5b7244
--- /dev/null
+++ b/package_fix/console-bridge-vendor/prep.fix
@@ -0,0 +1 @@
+cp %{SOURCE1} .
diff --git a/package_fix/console-bridge-vendor/source.fix b/package_fix/console-bridge-vendor/source.fix
new file mode 100644
index 0000000000000000000000000000000000000000..c522693d1587ba0d508f794bb240899c3fecd5c8
--- /dev/null
+++ b/package_fix/console-bridge-vendor/source.fix
@@ -0,0 +1,2 @@
+Source1:        1.0.2.tar.gz
+Patch0: 0-console-bridge-vendor-change-cmake-download.patch
diff --git a/package_fix/google-benchmark-vendor/0-google-benchmark-vendor-change-cmake-download.patch b/package_fix/google-benchmark-vendor/0-google-benchmark-vendor-change-cmake-download.patch
deleted file mode 100644
index 58307612ced5c60df6d3a65f2aaaf9cb9e7be36f..0000000000000000000000000000000000000000
--- a/package_fix/google-benchmark-vendor/0-google-benchmark-vendor-change-cmake-download.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur ros-humble-google-benchmark-vendor-0.1.1_org/CMakeLists.txt ros-humble-google-benchmark-vendor-0.1.1/CMakeLists.txt
---- ros-humble-google-benchmark-vendor-0.1.1_org/CMakeLists.txt	2023-04-26 11:29:50.966417966 +0800
-+++ ros-humble-google-benchmark-vendor-0.1.1/CMakeLists.txt	2023-04-26 11:43:25.350347881 +0800
-@@ -55,9 +55,7 @@
-   include(ExternalProject)
- 
-   externalproject_add(benchmark-${GOOGLE_BENCHMARK_TARGET_VERSION}
--    GIT_REPOSITORY https://github.com/google/benchmark.git
--    GIT_TAG c05843a9f622db08ad59804c190f98879b76beba  # v${GOOGLE_BENCHMARK_TARGET_VERSION}
--    GIT_CONFIG advice.detachedHead=false
-+    URL ${CMAKE_CURRENT_SOURCE_DIR}/benchmark-c05843a9f622db08ad59804c190f98879b76beba.tar.gz
-     # Suppress git update due to https://gitlab.kitware.com/cmake/cmake/-/issues/16419
-     # See https://github.com/ament/uncrustify_vendor/pull/22 for details
-     UPDATE_COMMAND ""
diff --git a/package_fix/google-benchmark-vendor/benchmark-c05843a9f622db08ad59804c190f98879b76beba.tar.gz b/package_fix/google-benchmark-vendor/benchmark-c05843a9f622db08ad59804c190f98879b76beba.tar.gz
deleted file mode 100644
index 9370b4bab1b1069b20bc45d7de80718c2fd62f04..0000000000000000000000000000000000000000
Binary files a/package_fix/google-benchmark-vendor/benchmark-c05843a9f622db08ad59804c190f98879b76beba.tar.gz and /dev/null differ
diff --git a/package_fix/google-benchmark-vendor/prep.fix b/package_fix/google-benchmark-vendor/prep.fix
deleted file mode 100644
index daa69c36045e73ff6c657096b732a962df8912fa..0000000000000000000000000000000000000000
--- a/package_fix/google-benchmark-vendor/prep.fix
+++ /dev/null
@@ -1,2 +0,0 @@
-cp %{SOURCE1} .
-cp ${RPM_SOURCE_DIR}/0-google-benchmark-vendor-change-cmake-download.patch .
diff --git a/package_fix/google-benchmark-vendor/source.fix b/package_fix/google-benchmark-vendor/source.fix
deleted file mode 100644
index 98303eba96d4cbc340ec18fda30d73b77aa89daf..0000000000000000000000000000000000000000
--- a/package_fix/google-benchmark-vendor/source.fix
+++ /dev/null
@@ -1,3 +0,0 @@
-Source1:        benchmark-c05843a9f622db08ad59804c190f98879b76beba.tar.gz
-
-Patch0: 0-google-benchmark-vendor-change-cmake-download.patch
diff --git a/package_fix/libyaml-vendor/0-libyaml-vendor-change-cmake-download.patch b/package_fix/libyaml-vendor/0-libyaml-vendor-change-cmake-download.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e5909ba44b19d513d6bd23ebee7abfd1b558945c
--- /dev/null
+++ b/package_fix/libyaml-vendor/0-libyaml-vendor-change-cmake-download.patch
@@ -0,0 +1,14 @@
+diff -Naur ros-humble-libyaml-vendor-1.2.2_org/CMakeLists.txt ros-humble-libyaml-vendor-1.2.2/CMakeLists.txt
+--- ros-humble-libyaml-vendor-1.2.2_org/CMakeLists.txt	2023-04-26 17:16:59.663537006 +0800
++++ ros-humble-libyaml-vendor-1.2.2/CMakeLists.txt	2023-04-26 17:30:31.211425347 +0800
+@@ -61,9 +61,7 @@
+   endif()
+   include(ExternalProject)
+   externalproject_add(libyaml-0.2.5
+-    GIT_REPOSITORY https://github.com/yaml/libyaml.git
+-    GIT_TAG 2c891fc7a770e8ba2fec34fc6b545c672beb37e6  # 0.2.5
+-    GIT_CONFIG advice.detachedHead=false
++    URL ${CMAKE_CURRENT_SOURCE_DIR}/libyaml-0.2.5.tar.gz
+     # Suppress git update due to https://gitlab.kitware.com/cmake/cmake/-/issues/16419
+     # See https://github.com/ament/uncrustify_vendor/pull/22 for details
+     UPDATE_COMMAND ""
diff --git a/package_fix/libyaml-vendor/libyaml-0.2.5.tar.gz b/package_fix/libyaml-vendor/libyaml-0.2.5.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..4b56c6eed87ac6ba314ef222443a643b8384bb7d
Binary files /dev/null and b/package_fix/libyaml-vendor/libyaml-0.2.5.tar.gz differ
diff --git a/package_fix/libyaml-vendor/prep.fix b/package_fix/libyaml-vendor/prep.fix
new file mode 100644
index 0000000000000000000000000000000000000000..f5881bc920fe62c102d3779689c602c1bc5b7244
--- /dev/null
+++ b/package_fix/libyaml-vendor/prep.fix
@@ -0,0 +1 @@
+cp %{SOURCE1} .
diff --git a/package_fix/libyaml-vendor/source.fix b/package_fix/libyaml-vendor/source.fix
new file mode 100644
index 0000000000000000000000000000000000000000..93e5552e72c89abf85ee5cb57f1172e4d5471cc7
--- /dev/null
+++ b/package_fix/libyaml-vendor/source.fix
@@ -0,0 +1,2 @@
+Source1:        libyaml-0.2.5.tar.gz
+Patch0: 0-libyaml-vendor-change-cmake-download.patch
diff --git a/spec_fix/console-bridge-vendor.BuildRequires b/spec_fix/console-bridge-vendor.BuildRequires
new file mode 100644
index 0000000000000000000000000000000000000000..36a58cd5e20483a22cbbbbf4404b709c00b31993
--- /dev/null
+++ b/spec_fix/console-bridge-vendor.BuildRequires
@@ -0,0 +1 @@
+-libconsole-bridge-dev
diff --git a/spec_fix/console-bridge-vendor.Requires b/spec_fix/console-bridge-vendor.Requires
new file mode 100644
index 0000000000000000000000000000000000000000..36a58cd5e20483a22cbbbbf4404b709c00b31993
--- /dev/null
+++ b/spec_fix/console-bridge-vendor.Requires
@@ -0,0 +1 @@
+-libconsole-bridge-dev
diff --git a/spec_fix/google-benchmark-vendor.BuildRequires b/spec_fix/google-benchmark-vendor.BuildRequires
deleted file mode 100644
index 13315b219c25bbee2f279f499a742222e2fb0e48..0000000000000000000000000000000000000000
--- a/spec_fix/google-benchmark-vendor.BuildRequires
+++ /dev/null
@@ -1 +0,0 @@
--benchmark
diff --git a/spec_fix/google-benchmark-vendor.Requires b/spec_fix/google-benchmark-vendor.Requires
deleted file mode 100644
index 13315b219c25bbee2f279f499a742222e2fb0e48..0000000000000000000000000000000000000000
--- a/spec_fix/google-benchmark-vendor.Requires
+++ /dev/null
@@ -1 +0,0 @@
--benchmark
diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap
index 6947d909d2c1de4e1a72df03ef4d4d6f5f6d3bb5..6d1b2e7f24529be8a79b0f494bd6afff9bd04ae5 100644
--- a/spec_fix/pkg.remap
+++ b/spec_fix/pkg.remap
@@ -2,6 +2,7 @@ gtest gtest-devel
 tinyxml2 tinyxml2-devel
 tinyxml tinyxml-devel
 yaml-cpp yaml-cpp-devel
+yaml yaml-cpp-devel
 libxml2-utils libxml2
 pydocstyle python3-pydocstyle
 pkg-config pkgconfig
@@ -40,3 +41,4 @@ zbar zbar-devel
 zlib zlib-devel
 libsqlite3-dev sqlite-devel
 google-mock gmock-devel
+benchmark google-benchmark-devel
diff --git a/spec_fix/tracetools.test-BuildRequires b/spec_fix/tracetools.test-BuildRequires
new file mode 100644
index 0000000000000000000000000000000000000000..4dfb4dc952318dacc2d16ebe97ba0109dac40c37
--- /dev/null
+++ b/spec_fix/tracetools.test-BuildRequires
@@ -0,0 +1,5 @@
+-ros-%{ros_distro}-launch
+-ros-%{ros_distro}-launch-ros
+-ros-%{ros_distro}-tracetools-launch
+-ros-%{ros_distro}-tracetools-read
+-ros-%{ros_distro}-tracetools-trace