diff --git a/1.9.12.tar.gz b/1.9.13-1.tar.gz similarity index 33% rename from 1.9.12.tar.gz rename to 1.9.13-1.tar.gz index b24963e7456935366408bf032b0a3fe563e13f61..7999a643e28969cfe0f8fdd4c79f7693b2ca229e 100644 Binary files a/1.9.12.tar.gz and b/1.9.13-1.tar.gz differ diff --git a/README.en.md b/README.en.md index 327c9ea7975a975b23033f8d06690167989ff26b..4f50e78a7834ba1ab9a48b45e9a3b7f2eeb2ac93 100644 --- a/README.en.md +++ b/README.en.md @@ -18,11 +18,11 @@ Angular tools: angles::find_min_max_delta, angles::two_pi_complement 1. Dowload RPM -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/Mainline/standard_aarch64/aarch64/angles-1.9.12-1.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/angles-1.9.13-1.oe1.aarch64.rpm 2. Install RPM -sudo rpm -ivh angles-1.9.12-1.oe1.aarch64.rpm +sudo rpm -ivh angles-1.9.13-1.oe1.aarch64.rpm #### Instructions diff --git a/README.md b/README.md index 7939bd17ce04ded7df7919355fa2ab8526804d33..9e74f104e306208bcfe88ffba37c0451d57d4cf6 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,10 @@ 1. 下载rpm包 -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/Mainline/standard_aarch64/aarch64/angles-1.9.12-1.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/angles-1.9.13-1.oe1.aarch64.rpm 2. 安装rpm包 -sudo rpm -ivh angles-1.9.12-1.oe1.aarch64.rpm +sudo rpm -ivh angles-1.9.13-1.oe1.aarch64.rpm #### 使用说明 diff --git a/angles.spec b/angles.spec index d7e923b1b2068d29ce1874457f00f35bb8d6898a..963fbd46fb5c4d9c62f8508fcb41262bc7a070b8 100644 --- a/angles.spec +++ b/angles.spec @@ -1,70 +1,79 @@ Name: angles -Version: 1.9.12 +Version: 1.9.13 Release: 1 -Summary: This is ROS melodic angles Package -License: GPL -URL: https://github.com/ros-gbp/angles-release/archive/release/melodic/angles -Source0: https://github.com/ros-gbp/angles-release/archive/release/melodic/%{version}.tar.gz +Summary: This is ROS noetic angles Package +License: Public Domain and Apache-2.0 and BSD and MIT and BSL-1.0 and LGPL-2.1-only and MPL-2.0 and GPL-3.0-only and GPL-2.0-or-later and MPL-1.1 and IJG and Zlib and OFL-1.1 +URL: https://github.com/ros-gbp/angles-release/archive/release/noetic/angles +Source0: https://github.com/ros-gbp/angles-release/archive/release/noetic/%{version}-1.tar.gz BuildRequires: gcc-c++ BuildRequires: cmake -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: python3 +BuildRequires: python3-setuptools %description -This is ROS melodic angles Package . +This is ROS noetic angles Package . %prep - %setup - -pwd - %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 .. +# 3rdparty cd .. ./src/catkin/bin/catkin_make_isolated --install -mkdir -p %{buildroot}/opt/ros/melodic/ -cp -r install_isolated/* %{buildroot}/opt/ros/melodic/ +#### +# 对install_isoloate内部的变量名称进行替换 +# +#### +SRC_PATH=$PWD/install_isolated +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/noetic/ +cp -r install_isolated/* %{buildroot}/opt/ros/noetic/ +cp install_isolated/.rosinstall %{buildroot}/opt/ros/noetic/ +cp install_isolated/.catkin %{buildroot}/opt/ros/noetic/ %files %defattr(-,root,root) -/opt/ros/melodic/* - - - +/opt/ros/noetic/* +/opt/ros/noetic/.rosinstall +/opt/ros/noetic/.catkin %changelog -* Thu 12-15-2020 openEuler Buildteam -- Package init +* Thu 12-15-2020 diff --git a/angles.yaml b/angles.yaml index dd07cda19ddced5367206acace329c67de779963..b7ce916be6ab6000b082aadef9e2119fe79d31b3 100644 --- a/angles.yaml +++ b/angles.yaml @@ -1,6 +1,6 @@ --- version_control: git src_repo: https://github.com/ros/angles.git -tag_prefix: 1.9.12-1 +tag_prefix: 1.9.13-1 separator: "." -