!36 modify buildrequire crypto to cryptography

From: @zhangxianting Reviewed-by: @davidhan008 Signed-off-by: @davidhan008
modify buildrequire crypto to cryptography
2024-06-15 08:02:35 +00:00 · 2024-05-29 17:10:21 +08:00 · 2023-04-18 06:22:22 +00:00 · 2023-03-13 09:33:27 +00:00 · 2023-03-13 08:37:09 +00:00 · 2023-03-08 02:36:39 +00:00
4 changed files with 209 additions and 18 deletions
--- a/1.15.11-1.tar.gz
+++ b/1.15.11-1.tar.gz
--- a/README.en.md
+++ b/README.en.md
@ -6,21 +6,99 @@ ROS communications-related packages, including core client libraries (roscpp, ro

 #### Software Architecture

+Software architecture description
+
 The ros_comm stack contains the ROS middleware/communications packages. These packages are collectively known as the ROS "Graph" layer. They provide implementations and tools for topics, nodes, services, and parameters. This includes the supported ROS client libraries: roscpp, rospy, and roslisp.

+input:
+```
+ros_comm
+├── clients
+│   ├── roscpp
+│   └── rospy
+├── ros_comm
+│   ├── CHANGELOG.rst
+│   ├── CMakeLists.txt
+│   └── package.xml
+├── test
+│   ├── test_rosbag
+│   ├── test_rosbag_storage
+│   ├── test_roscpp
+│   ├── test_rosgraph
+│   ├── test_roslaunch
+│   ├── test_roslib_comm
+│   ├── test_rosmaster
+│   ├── test_rosparam
+│   ├── test_rospy
+│   ├── test_rosservice
+│   ├── test_rostest
+│   └── test_rostopic
+├── tools
+│   ├── rosbag
+│   ├── rosbag_storage
+│   ├── rosgraph
+│   ├── roslaunch
+│   ├── rosmaster
+│   ├── rosmsg
+│   ├── rosnode
+│   ├── rosout
+│   ├── rosparam
+│   ├── rosservice
+│   ├── rostest
+│   ├── rostopic
+│   └── topic_tools
+└── utilities
+    ├── message_filters
+    ├── roslz4
+    ├── roswtf
+    └── xmlrpcpp
+
+```
+
 #### Installation

-1. Dowload RPM
+1.  Download RPM

-wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/ros_comm-1.15.11-1.oe1.aarch64.rpm
+aarch64:

-2. Install RPM
+wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_aarch64/aarch64/ros-noetic-ros-comm/ros-noetic-ros-comm-1.15.11-2.oe2203.aarch64.rpm

-sudo rpm -ivh ros_comm-1.15.11-1.oe1.aarch64.rpm
+x86_64:
+
+wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_x86_64/x86_64/ros-noetic-ros-comm/ros-noetic-ros-comm-1.15.11-2.oe2203.x86_64.rpm 
+
+2.  Install RPM
+
+aarch64:
+
+sudo rpm -ivh ros-noetic-ros-comm-1.15.11-2.oe2203.aarch64.rpm --nodeps --force
+
+x86_64:
+
+sudo rpm -ivh ros-noetic-ros-comm-1.15.11-2.oe2203.x86_64.rpm --nodeps --force

 #### Instructions

-Exit the ros_comm file under the /opt/ros/melodic/ directory , Prove that the software installation is successful
+Dependence installation
+
+sh /opt/ros/noetic/install_dependence.sh
+
+Exit the following output file under the /opt/ros/noetic/ directory , Prove that the software installation is successful
+
+output:
+```
+ros_comm/
+├── cmake.lock
+├── env.sh
+├── local_setup.bash
+├── local_setup.sh
+├── local_setup.zsh
+├── setup.bash
+├── setup.sh
+├── _setup_util.py
+└── setup.zsh
+
+```

 #### Contribution

--- a/README.md
+++ b/README.md
@ -8,19 +8,95 @@ ros_comm软件包提供了与ROS通信相关的软件包，包括核心客户端

 该ros_comm堆栈包含ROS中间件/通信包。这些程序包统称为ROS“图形”层。它们为主题，节点，服务和参数提供了实现和工具。这包括受支持的ROS客户端库：roscpp，rospy和roslisp。

+文件内容:
+```
+ros_comm
+├── clients
+│   ├── roscpp
+│   └── rospy
+├── ros_comm
+│   ├── CHANGELOG.rst
+│   ├── CMakeLists.txt
+│   └── package.xml
+├── test
+│   ├── test_rosbag
+│   ├── test_rosbag_storage
+│   ├── test_roscpp
+│   ├── test_rosgraph
+│   ├── test_roslaunch
+│   ├── test_roslib_comm
+│   ├── test_rosmaster
+│   ├── test_rosparam
+│   ├── test_rospy
+│   ├── test_rosservice
+│   ├── test_rostest
+│   └── test_rostopic
+├── tools
+│   ├── rosbag
+│   ├── rosbag_storage
+│   ├── rosgraph
+│   ├── roslaunch
+│   ├── rosmaster
+│   ├── rosmsg
+│   ├── rosnode
+│   ├── rosout
+│   ├── rosparam
+│   ├── rosservice
+│   ├── rostest
+│   ├── rostopic
+│   └── topic_tools
+└── utilities
+    ├── message_filters
+    ├── roslz4
+    ├── roswtf
+    └── xmlrpcpp
+
+```
+
 #### 安装教程

-1. 下载rpm包
+1.  下载rpm包

-wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/ros_comm-1.15.11-1.oe1.aarch64.rpm
+aarch64:

-2. 安装rpm包
+wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_aarch64/aarch64/ros-noetic-ros-comm/ros-noetic-ros-comm-1.15.11-2.oe2203.aarch64.rpm

-sudo rpm -ivh ros_comm-1.15.11-1.oe1.aarch64.rpm
+x86_64:
+
+wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_x86_64/x86_64/ros-noetic-ros-comm/ros-noetic-ros-comm-1.15.11-2.oe2203.x86_64.rpm 
+
+2.  安装rpm包
+
+aarch64:
+
+sudo rpm -ivh ros-noetic-ros-comm-1.15.11-2.oe2203.aarch64.rpm --nodeps --force
+
+x86_64:
+
+sudo rpm -ivh ros-noetic-ros-comm-1.15.11-2.oe2203.x86_64.rpm --nodeps --force

 #### 使用说明

-安装完成以后，在/opt/ros/melodic/目录下有ros_comm/文件夹证明安装成功
+依赖环境安装:
+
+sh /opt/ros/noetic/install_dependence.sh
+
+安装完成以后，在/opt/ros/noetic/目录下有如下输出,则表示安装成功
+
+输出:
+```
+ros_comm/
+├── cmake.lock
+├── env.sh
+├── local_setup.bash
+├── local_setup.sh
+├── local_setup.zsh
+├── setup.bash
+├── setup.sh
+├── _setup_util.py
+└── setup.zsh
+
+```

 #### 参与贡献

--- a/ros_comm.spec
+++ b/ros_comm.spec
@ -1,7 +1,7 @@
-Name:		ros_comm
+Name:		ros-noetic-ros-comm
 Version:	1.15.11
-Release:	2
-Summary:	This is ROS noetic ros_comm Package
+Release:	3
+Summary:	This is ROS noetic %{name} Package
 License:	Public Domain and Apache-2.0 and BSD and MIT and BSL-1.0 and LGPL-2.1-only
 URL:		https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/ros_comm
 Source0:	https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/ros_comm/1.15.11-1.tar.gz
@ -13,15 +13,32 @@ BuildRequires:	python3-devel
 BuildRequires:	python3-setuptools
 BuildRequires:	openssl-devel
 BuildRequires:	boost-devel
+BuildRequires:	uuid-devel
+BuildRequires:	libuuid-devel
+BuildRequires:	libtiff-devel
+BuildRequires:	libwebp-devel
+BuildRequires:	libjpeg-turbo-devel
+BuildRequires:	yaml-cpp-devel
 BuildRequires:	python3-gpgme
 BuildRequires:	gpgme-devel
 BuildRequires:	cpp-gpgme
-BuildRequires:	python3-crypto
+BuildRequires:	python3-cryptography
+BuildRequires:	boost-devel
+BuildRequires:	libtool-ltdl-devel
+BuildRequires:  libpng-devel
+BuildRequires:	fltk-devel
+BuildRequires:	bullet-devel
+BuildRequires:	qt5-devel
+BuildRequires:	python3-sip-devel
+BuildRequires:	python3-qt5
+BuildRequires:	python3-sip
 BuildRequires:  gtest-devel
 BuildRequires:  gmock-devel
+BuildRequires:  chrpath
+BuildRequires:  make

 %description
-This is ROS noetic ros_comm Package.
+This is %{name} Package

 %prep
 %setup 
@ -71,8 +88,8 @@ cd ..

 cd ..

-
 ./src/catkin/bin/catkin_make_isolated --install 
+cp install_dependence.sh install_isolated/

 ####
 # 对install_isoloate内部的变量名称进行替换
@ -91,14 +108,34 @@ mkdir -p %{buildroot}/usr/local/
 cp -r install_isolated/* %{buildroot}/opt/ros/noetic/
 cp  install_isolated/.rosinstall %{buildroot}/opt/ros/noetic/
 cp  install_isolated/.catkin %{buildroot}/opt/ros/noetic/
-#cp -r 3rdparty/install/* %{buildroot}/usr/local/
+
+####
+# 对chrpath修改
+#
+####
+file `find  %{buildroot}/opt/ros/noetic/lib/ -type f` | grep -w ELF | awk -F: '{print $1}' | xargs chrpath -d
+
+
+#chrpath -d %{buildroot}/opt/ros/noetic/lib/librostime.so
+#mkdir -p %{buildroot}/etc/ld.so.conf.d
+#echo %{buildroot}/opt/ros/noetic/lib/:%{buildroot} > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+
+#%post
+#/sbin/ldconfig
+
+#%postun
+#/sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 /opt/ros/noetic/*
 /opt/ros/noetic/.rosinstall
 /opt/ros/noetic/.catkin
-#/usr/local/*
+
 %changelog
+* Wed May 29 2024 zhangxianting <zhangxianting@uniontech.com> - 1.15.11-3
+- modify buildrequire crypto to cryptography
+
 * Sat Feb 26 2022 openEuler Buildteam <hanhaomin008@126.com> - 1.15.11-2
 - Fix issue 2065
Author	SHA1	Message	Date
openeuler-ci-bot	30f8263140	!36 modify buildrequire crypto to cryptography From: @zhangxianting Reviewed-by: @davidhan008 Signed-off-by: @davidhan008	2024-06-15 08:02:35 +00:00
zhangxianting	bbd82d5f0b	modify buildrequire crypto to cryptography	2024-05-29 17:10:21 +08:00
openeuler-ci-bot	f4d603849e	!20 同步分支 From: @davidhan008 Reviewed-by: @anchuanxu Signed-off-by: @anchuanxu	2023-04-18 06:22:22 +00:00
openeuler-ci-bot	ad654ec41a	!19 修复chrpath From: @davidhan008 Reviewed-by: @anchuanxu Signed-off-by: @anchuanxu	2023-03-13 09:33:27 +00:00
davidhan008	d3f2b99662	update ros_comm.spec. Signed-off-by: davidhan008 <619409713@qq.com>	2023-03-13 08:37:09 +00:00
openeuler-ci-bot	c23ec4937a	!16 fix chrpath From: @davidhan008 Reviewed-by: @anchuanxu Signed-off-by: @anchuanxu	2023-03-08 02:36:39 +00:00
davidhan008	dd431eec4f	fix chrpath	2023-03-05 17:26:11 +08:00
openeuler-ci-bot	0ec0cde6ed	!14 update poco for master From: @simonaxi Reviewed-by: @anchuanxu Signed-off-by: @anchuanxu	2023-02-03 12:50:52 +00:00
simonaXi	9c26197a93	Fix: update poco for master	2023-02-03 20:19:33 +08:00
openeuler-ci-bot	8523f96ee2	!7 ros 基础版本合并 From: @anchuanxu Reviewed-by: @xiao_yun_wang Signed-off-by: @xiao_yun_wang	2022-11-14 05:54:30 +00:00
openeuler-ci-bot	cd9a3d7278	!6 Fix spec for new From: @simonaxi Reviewed-by: @anchuanxu Signed-off-by: @anchuanxu	2022-11-12 12:10:05 +00:00
simonaXi	175101feed	Fix: fix	2022-11-12 18:36:45 +08:00
simonaXi	8929140d34	Fix: fix	2022-11-12 16:58:14 +08:00
simonaXi	0105b5f874	Fix: fix	2022-11-12 15:02:23 +08:00