diff --git a/1.14.6-1.tar.gz b/1.15.11-1.tar.gz similarity index 69% rename from 1.14.6-1.tar.gz rename to 1.15.11-1.tar.gz index cd21d2e..6d8fdf9 100644 Binary files a/1.14.6-1.tar.gz and b/1.15.11-1.tar.gz differ diff --git a/README.en.md b/README.en.md index 6133ec6..4ceca1f 100644 --- a/README.en.md +++ b/README.en.md @@ -12,11 +12,11 @@ The ros_comm stack contains the ROS middleware/communications packages. These pa 1. Dowload RPM -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.03:/LTS/standard_aarch64/aarch64/ros_comm-1.14.6-1.oe1.aarch64.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 2. Install RPM -sudo rpm -ivh ros_comm-1.14.6-1.oe1.aarch64.rpm +sudo rpm -ivh ros_comm-1.15.11-1.oe1.aarch64.rpm #### Instructions diff --git a/README.md b/README.md index db81056..fe2638e 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,11 @@ ros_comm软件包提供了与ROS通信相关的软件包,包括核心客户端 1. 下载rpm包 -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.03:/LTS/standard_aarch64/aarch64/ros_comm-1.14.6-1.oe1.aarch64.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 2. 安装rpm包 -sudo rpm -ivh ros_comm-1.14.6-1.oe1.aarch64.rpm +sudo rpm -ivh ros_comm-1.15.11-1.oe1.aarch64.rpm #### 使用说明 diff --git a/ros_comm.spec b/ros_comm.spec index ac3b095..d04f602 100644 --- a/ros_comm.spec +++ b/ros_comm.spec @@ -1,51 +1,70 @@ Name: ros_comm -Version: 1.14.6 +Version: 1.15.11 Release: 2 -Summary: This is ROS melodic ros_comm Package +Summary: This is ROS noetic ros_comm 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/melodic/ros_comm -Source0: https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/ros_comm/1.14.6-1.tar.gz +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 BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: lz4-devel BuildRequires: bzip2-devel -BuildRequires: python-devel -BuildRequires: python-setuptools +BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: openssl-devel BuildRequires: boost-devel +BuildRequires: python3-gpgme +BuildRequires: gpgme-devel +BuildRequires: cpp-gpgme +BuildRequires: python3-crypto %description -This is ROS melodic ros_comm Package. +This is ROS noetic ros_comm Package. + +%prep +%setup %install cd 3rdparty/ cd empy-3.3.4/ -python setup.py install --user +python3 setup.py install --user cd .. cd six-1.15.0/ -python setup.py install --user +python3 setup.py install --user cd .. cd setuptools_scm-4.1.2/ -python setup.py install --user +python3 setup.py install --user cd .. cd python-dateutil-2.8.1/ -python setup.py install --user +python3 setup.py install --user cd .. cd pyparsing-2.4.7/ -python setup.py install --user +python3 setup.py install --user cd .. cd docutils-0.16/ -python setup.py install --user +python3 setup.py install --user cd .. cd catkin_pkg-0.4.22/ -python setup.py install --user +python3 setup.py install --user +cd .. + +cd PyYAML-5.3.1/ +python3 setup.py install --user +cd .. + +cd distro-1.5.0/ +python3 setup.py install --user +cd .. + +cd rospkg-1.2.8/ +python3 setup.py install --user cd .. @@ -89,26 +108,25 @@ cd .. # #### SRC_PATH=$PWD/install_isolated -DST_PATH=/opt/ros/melodic +DST_PATH=/opt/ros/noetic sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install_isolated/*` #### # 添加.catkin和.rosinstall文件 # #### -mkdir -p %{buildroot}/opt/ros/melodic/ +mkdir -p %{buildroot}/opt/ros/noetic/ mkdir -p %{buildroot}/usr/local/ -cp -r install_isolated/* %{buildroot}/opt/ros/melodic/ -cp install_isolated/.rosinstall %{buildroot}/opt/ros/melodic/ -cp install_isolated/.catkin %{buildroot}/opt/ros/melodic/ +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/ %files %defattr(-,root,root) -/opt/ros/melodic/* -/opt/ros/melodic/.rosinstall -/opt/ros/melodic/.catkin +/opt/ros/noetic/* +/opt/ros/noetic/.rosinstall +/opt/ros/noetic/.catkin /usr/local/* %changelog * Thu 12-15-2020 openEuler Buildteam - Package init - diff --git a/ros_comm.yaml b/ros_comm.yaml index f73074a..099eea5 100644 --- a/ros_comm.yaml +++ b/ros_comm.yaml @@ -1,5 +1,5 @@ --- version_control: git src_repo: https://github.com/ros/ros_comm.git -tag_prefix: 1.14.6-1 +tag_prefix: 1.15.11-1 separator: "."