From 9dd20b7a3d419f283dfc876e45e742b3fbc256ae Mon Sep 17 00:00:00 2001 From: zhangyinuo Date: Wed, 31 Jul 2024 15:11:03 +0800 Subject: [PATCH 1/5] test --- sdformat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdformat.spec b/sdformat.spec index adeea26..c9bc965 100644 --- a/sdformat.spec +++ b/sdformat.spec @@ -28,7 +28,7 @@ BuildRequires: ruby-devel >= 1.9 BuildRequires: /usr/bin/ruby BuildRequires: rubygem-multi_xml BuildRequires: tinyxml-devel -BuildRequires: ros-%{ros_distro}-urdfdom +BuildRequires: ros-humble-urdfdom BuildRequires: rubygem-rexml #Test dependencies -- Gitee From 73742cff1a023fe948cf4031bedd8d9f70786ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B8=80=E8=AF=BA?= Date: Fri, 2 Aug 2024 06:20:23 +0000 Subject: [PATCH 2/5] update sdformat.spec. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张一诺 --- sdformat.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sdformat.spec b/sdformat.spec index c9bc965..d2e7797 100644 --- a/sdformat.spec +++ b/sdformat.spec @@ -29,6 +29,7 @@ BuildRequires: /usr/bin/ruby BuildRequires: rubygem-multi_xml BuildRequires: tinyxml-devel BuildRequires: ros-humble-urdfdom +BuildRequires: openeuler-ros BuildRequires: rubygem-rexml #Test dependencies -- Gitee From 9ee7ad2f59b63517b0fd3ea70de7204ffe88089f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B8=80=E8=AF=BA?= Date: Fri, 2 Aug 2024 06:27:00 +0000 Subject: [PATCH 3/5] update sdformat.spec. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张一诺 --- sdformat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdformat.spec b/sdformat.spec index d2e7797..fca206c 100644 --- a/sdformat.spec +++ b/sdformat.spec @@ -28,8 +28,8 @@ BuildRequires: ruby-devel >= 1.9 BuildRequires: /usr/bin/ruby BuildRequires: rubygem-multi_xml BuildRequires: tinyxml-devel -BuildRequires: ros-humble-urdfdom BuildRequires: openeuler-ros +BuildRequires: ros-humble-urdfdom BuildRequires: rubygem-rexml #Test dependencies -- Gitee From 114831702bde79b1bdc08a9fbeca242fb4941ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B8=80=E8=AF=BA?= Date: Tue, 6 Aug 2024 03:17:21 +0000 Subject: [PATCH 4/5] update sdformat.spec. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张一诺 --- sdformat.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdformat.spec b/sdformat.spec index fca206c..2e407c4 100644 --- a/sdformat.spec +++ b/sdformat.spec @@ -28,8 +28,6 @@ BuildRequires: ruby-devel >= 1.9 BuildRequires: /usr/bin/ruby BuildRequires: rubygem-multi_xml BuildRequires: tinyxml-devel -BuildRequires: openeuler-ros -BuildRequires: ros-humble-urdfdom BuildRequires: rubygem-rexml #Test dependencies @@ -60,6 +58,8 @@ The %{name}-doc package contains development documentation for %{name}. %prep +yum install -y openeuler-ros +yum install -y ros-humble-urdfdom %setup -q %patch0 -p0 -b .latex %patch1 -p1 -b .rubydir -- Gitee From dc33c0005ba93a14bc815fb0c0647d8dad488c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B8=80=E8=AF=BA?= Date: Tue, 6 Aug 2024 03:26:37 +0000 Subject: [PATCH 5/5] update sdformat.spec. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张一诺 --- sdformat.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdformat.spec b/sdformat.spec index 2e407c4..d9255ea 100644 --- a/sdformat.spec +++ b/sdformat.spec @@ -29,6 +29,7 @@ BuildRequires: /usr/bin/ruby BuildRequires: rubygem-multi_xml BuildRequires: tinyxml-devel BuildRequires: rubygem-rexml +BuildRequires: openeuler-ros #Test dependencies BuildRequires: python3 @@ -58,13 +59,12 @@ The %{name}-doc package contains development documentation for %{name}. %prep -yum install -y openeuler-ros -yum install -y ros-humble-urdfdom %setup -q %patch0 -p0 -b .latex %patch1 -p1 -b .rubydir %build +yum install -y ros-humble-urdfdom %cmake \ -DCMAKE_BUILD_TYPE=Release \ -DLIB_INSTALL_DIR:STRING=%{_lib} \ -- Gitee