From ee25ae4f8d0b5473c7bc6b5fa83d172eabce8442 Mon Sep 17 00:00:00 2001
From: davidhan008 <619409713@qq.com>
Date: Thu, 27 Feb 2025 20:43:14 +0800
Subject: [PATCH 1/2] define ros_distro to adapt to eur

---
 ament-cmake-auto.spec                       | 1 +
 ament-cmake-core.spec                       | 1 +
 ament-cmake-export-definitions.spec         | 1 +
 ament-cmake-export-dependencies.spec        | 1 +
 ament-cmake-export-include-directories.spec | 1 +
 ament-cmake-export-interfaces.spec          | 1 +
 ament-cmake-export-libraries.spec           | 1 +
 ament-cmake-export-link-flags.spec          | 1 +
 ament-cmake-export-targets.spec             | 1 +
 ament-cmake-gen-version-h.spec              | 1 +
 ament-cmake-gmock.spec                      | 1 +
 ament-cmake-google-benchmark.spec           | 1 +
 ament-cmake-gtest.spec                      | 1 +
 ament-cmake-include-directories.spec        | 1 +
 ament-cmake-libraries.spec                  | 1 +
 ament-cmake-nose.spec                       | 1 +
 ament-cmake-pytest.spec                     | 1 +
 ament-cmake-python.spec                     | 1 +
 ament-cmake-target-dependencies.spec        | 1 +
 ament-cmake-test.spec                       | 1 +
 ament-cmake-version.spec                    | 1 +
 ament-cmake.spec                            | 1 +
 22 files changed, 22 insertions(+)

diff --git a/ament-cmake-auto.spec b/ament-cmake-auto.spec
index bcaae38..7e85b53 100644
--- a/ament-cmake-auto.spec
+++ b/ament-cmake-auto.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-auto
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-core.spec b/ament-cmake-core.spec
index 5035617..be94f30 100644
--- a/ament-cmake-core.spec
+++ b/ament-cmake-core.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-core
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-export-definitions.spec b/ament-cmake-export-definitions.spec
index 92f1f5c..f10ab81 100644
--- a/ament-cmake-export-definitions.spec
+++ b/ament-cmake-export-definitions.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-export-definitions
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-export-dependencies.spec b/ament-cmake-export-dependencies.spec
index 5ba6751..8117cc2 100644
--- a/ament-cmake-export-dependencies.spec
+++ b/ament-cmake-export-dependencies.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-export-dependencies
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-export-include-directories.spec b/ament-cmake-export-include-directories.spec
index c516330..ac728ea 100644
--- a/ament-cmake-export-include-directories.spec
+++ b/ament-cmake-export-include-directories.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-export-include-directories
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-export-interfaces.spec b/ament-cmake-export-interfaces.spec
index 3ae2122..8750c45 100644
--- a/ament-cmake-export-interfaces.spec
+++ b/ament-cmake-export-interfaces.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-export-interfaces
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-export-libraries.spec b/ament-cmake-export-libraries.spec
index a2a1413..91aa58e 100644
--- a/ament-cmake-export-libraries.spec
+++ b/ament-cmake-export-libraries.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-export-libraries
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-export-link-flags.spec b/ament-cmake-export-link-flags.spec
index 623a46d..7ad5120 100644
--- a/ament-cmake-export-link-flags.spec
+++ b/ament-cmake-export-link-flags.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-export-link-flags
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-export-targets.spec b/ament-cmake-export-targets.spec
index 4ac00f0..b8461d7 100644
--- a/ament-cmake-export-targets.spec
+++ b/ament-cmake-export-targets.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-export-targets
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-gen-version-h.spec b/ament-cmake-gen-version-h.spec
index 9336fb3..de570f2 100644
--- a/ament-cmake-gen-version-h.spec
+++ b/ament-cmake-gen-version-h.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-gen-version-h
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-gmock.spec b/ament-cmake-gmock.spec
index 273aed1..898fbbe 100644
--- a/ament-cmake-gmock.spec
+++ b/ament-cmake-gmock.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-gmock
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-google-benchmark.spec b/ament-cmake-google-benchmark.spec
index 15cbaf0..0df45c0 100644
--- a/ament-cmake-google-benchmark.spec
+++ b/ament-cmake-google-benchmark.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-google-benchmark
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-gtest.spec b/ament-cmake-gtest.spec
index bd1e213..ff53ef1 100644
--- a/ament-cmake-gtest.spec
+++ b/ament-cmake-gtest.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-gtest
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-include-directories.spec b/ament-cmake-include-directories.spec
index a919325..05dce9f 100644
--- a/ament-cmake-include-directories.spec
+++ b/ament-cmake-include-directories.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-include-directories
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-libraries.spec b/ament-cmake-libraries.spec
index 668c359..a581671 100644
--- a/ament-cmake-libraries.spec
+++ b/ament-cmake-libraries.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-libraries
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-nose.spec b/ament-cmake-nose.spec
index 5f42f00..cf8b187 100644
--- a/ament-cmake-nose.spec
+++ b/ament-cmake-nose.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-nose
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-pytest.spec b/ament-cmake-pytest.spec
index 00142c9..0440fce 100644
--- a/ament-cmake-pytest.spec
+++ b/ament-cmake-pytest.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-pytest
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-python.spec b/ament-cmake-python.spec
index 9129ecf..94b4329 100644
--- a/ament-cmake-python.spec
+++ b/ament-cmake-python.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-python
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-target-dependencies.spec b/ament-cmake-target-dependencies.spec
index 7e61044..4623f4e 100644
--- a/ament-cmake-target-dependencies.spec
+++ b/ament-cmake-target-dependencies.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-target-dependencies
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-test.spec b/ament-cmake-test.spec
index 53cda86..1c8d817 100644
--- a/ament-cmake-test.spec
+++ b/ament-cmake-test.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-test
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake-version.spec b/ament-cmake-version.spec
index 2cca050..3a39854 100644
--- a/ament-cmake-version.spec
+++ b/ament-cmake-version.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake-version
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
diff --git a/ament-cmake.spec b/ament-cmake.spec
index 46222bc..92eb903 100644
--- a/ament-cmake.spec
+++ b/ament-cmake.spec
@@ -7,6 +7,7 @@
 %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
 
 %define RosPkgName      ament-cmake
+%define ros_distro      humble
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        1.3.4
-- 
Gitee


From 20f25727c87752738e083a154f4558a21f32e6d5 Mon Sep 17 00:00:00 2001
From: davidhan008 <619409713@qq.com>
Date: Wed, 23 Apr 2025 09:54:07 +0800
Subject: [PATCH 2/2] fix

---
 ament-cmake-core.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ament-cmake-core.spec b/ament-cmake-core.spec
index be94f30..7ee4120 100644
--- a/ament-cmake-core.spec
+++ b/ament-cmake-core.spec
@@ -73,6 +73,8 @@ mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform}
 
 %make_build
 
+echo "ddddd"
+
 %install
 # Needed to bootstrap since the ros_workspace package does not yet exist.
 export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages
-- 
Gitee