diff --git a/1.13.0-1.tar.gz b/1.13.0-1.tar.gz index 703df0a9022407eeb705dbeffb015c30aaa0e4c1..e419b6b2e10256af63f4470e8ee814a4e0dc570f 100644 Binary files a/1.13.0-1.tar.gz and b/1.13.0-1.tar.gz differ diff --git a/README.en.md b/README.en.md index bc95087f3ffe9309ed9e2a56d5ad2292f867fb96..fc9de6a6c25c77bbefd939914fffbffdfd217852 100644 --- a/README.en.md +++ b/README.en.md @@ -20,7 +20,7 @@ sudo rpm -ivh pluginlib-1.13.0-1.oe1.aarch64.rpm #### Instructions -Exit the pluginlib file under the /opt/ros/melodic/ directory , Prove that the software installation is successful +Exit the pluginlib file under the /opt/ros/noetic/ directory , Prove that the software installation is successful #### Contribution diff --git a/README.md b/README.md index 14693fbd6189324f9dc4382f1a09629fc4673725..ce6521930cd5e30bf66b8e1f2dcf648edee5a57e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ sudo rpm -ivh pluginlib-1.13.0-1.oe1.aarch64.rpm #### 使用说明 -安装完成以后,在/opt/ros/melodic/目录下有pluginlib/文件夹证明安装成功 +安装完成以后,在/opt/ros/noetic/目录下有pluginlib/文件夹证明安装成功 #### 参与贡献 diff --git a/pluginlib.spec b/pluginlib.spec index 90c337d0b3c473e2c69af4affd8c4e0898390a86..61925ee6668a56d5b83510e631f974a0fea5ccd0 100644 --- a/pluginlib.spec +++ b/pluginlib.spec @@ -2,7 +2,7 @@ Name: pluginlib Version: 1.13.0 Release: 1 Summary: This is ROS noetic pluginlib Package -License: Public Domain and Apache-2.0 and BSD and MIT and BSL-1.0 +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/pluginlib-release/archive/release/noetic/pluginlib Source0: https://github.com/ros-gbp/pluginlib-release/archive/release/noetic/pluginlib/1.13.0-1.tar.gz BuildRequires: gcc-c++ @@ -11,10 +11,7 @@ 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 noetic pluginlib Package. @@ -53,37 +50,6 @@ cd catkin_pkg-0.4.22/ python3 setup.py install --user cd .. - -cd console_bridge/ -mkdir build/ -cd build/ -cmake .. -make -j8 -make install -cd .. -cd .. - -cd poco/ -mkdir cmake-build/ -mkdir cmake-release/ -cd cmake-build/ -cmake .. -make -j8 -make install -cd .. -cd .. - - -cd tinyxml2/ -mkdir build -cd build -cmake .. -make -j8 -make install -cd .. -cd .. - - cd .. @@ -102,17 +68,15 @@ sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install_isolated # #### mkdir -p %{buildroot}/opt/ros/noetic/ -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/ %files %defattr(-,root,root) /opt/ros/noetic/* /opt/ros/noetic/.rosinstall /opt/ros/noetic/.catkin -/usr/local/* %changelog * Thu 12-15-2020 openEuler Buildteam - Package init +