diff --git a/1.12.1-0.tar.gz b/1.13.0-1.tar.gz similarity index 65% rename from 1.12.1-0.tar.gz rename to 1.13.0-1.tar.gz index 12d805e33afe9fef971a07bfc4836d7e716f9b61..703df0a9022407eeb705dbeffb015c30aaa0e4c1 100644 Binary files a/1.12.1-0.tar.gz and b/1.13.0-1.tar.gz differ diff --git a/README.en.md b/README.en.md index 0f5e66961d1434d9067328bd1645d0d47677dbfe..bc95087f3ffe9309ed9e2a56d5ad2292f867fb96 100644 --- a/README.en.md +++ b/README.en.md @@ -12,15 +12,15 @@ Pluginlib includes The Plugin Description File and Registering/Exporting a Plug 1. Dowload RPM -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/Mainline/standard_aarch64/aarch64/pluginlib-1.12.1-1.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/pluginlib-1.13.0-1.oe1.aarch64.rpm 2. Install RPM -sudo rpm -ivh pluginlib-1.12.1-1.oe1.aarch64.rpm +sudo rpm -ivh pluginlib-1.13.0-1.oe1.aarch64.rpm #### Instructions -Exit the pluginlib file under the /opt/ros/melodic/devel_isolated/ directory , Prove that the software installation is successful +Exit the pluginlib file under the /opt/ros/melodic/ directory , Prove that the software installation is successful #### Contribution diff --git a/README.md b/README.md index 80304ae00d6e1879897f73b08275b073af823093..14693fbd6189324f9dc4382f1a09629fc4673725 100644 --- a/README.md +++ b/README.md @@ -13,15 +13,15 @@ Pluginlib 包含注册/导出插件的类和插件描述xml文件 1. 下载rpm包 -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/Mainline/standard_aarch64/aarch64/pluginlib-1.12.1-1.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/pluginlib-1.13.0-1.oe1.aarch64.rpm 2. 安装rpm包 -sudo rpm -ivh pluginlib-1.12.1-1.oe1.aarch64.rpm +sudo rpm -ivh pluginlib-1.13.0-1.oe1.aarch64.rpm #### 使用说明 -安装完成以后，在/opt/ros/melodic/devel_isolated/目录下有pluginlib/文件夹证明安装成功 +安装完成以后，在/opt/ros/melodic/目录下有pluginlib/文件夹证明安装成功 #### 参与贡献 diff --git a/pluginlib.spec b/pluginlib.spec index 023f8ff3aeda4386b78c39086b3fe00e9a66f2a6..90c337d0b3c473e2c69af4affd8c4e0898390a86 100644 --- a/pluginlib.spec +++ b/pluginlib.spec @@ -1,79 +1,56 @@ Name: pluginlib -Version: 1.12.1 -Release: 2 -Summary: This is ROS melodic pluginlib Package -License: GPL -URL: https://github.com/ros-gbp/pluginlib-release/archive/release/melodic/pluginlib -Source0: https://github.com/ros-gbp/pluginlib-release/archive/release/melodic/pluginlib/1.12.1-0.tar.gz +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 +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++ BuildRequires: cmake -BuildRequires: python-devel -BuildRequires: python-setuptools -#Requires: python-empy +BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: openssl-devel -#BuildRequires: gcc-gfortran -#BuildRequires: openblas-devel -#BuildRequires: sqlite-devel -#BuildRequires: fftw-devel BuildRequires: boost-devel -#BuildRequires: python3-devel -#BuildRequires: boost-python3-devel +BuildRequires: python3-gpgme +BuildRequires: gpgme-devel +BuildRequires: cpp-gpgme +BuildRequires: python3-crypto %description -This is ROS melodic pluginlib Package. +This is ROS noetic pluginlib Package. %prep %setup -#cd catkin-0.7.26/ - - - - -#%build - -#pwd -#mkdir build/ -#cd build/ && cmake .. - - %install -pwd - -#mkdir -p build/ -#cd build/ -#cmake .. -#cd .. - -cd src/ 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 .. @@ -81,7 +58,7 @@ cd console_bridge/ mkdir build/ cd build/ cmake .. -make +make -j8 make install cd .. cd .. @@ -101,36 +78,41 @@ cd tinyxml2/ mkdir build cd build cmake .. -make -j5 +make -j8 make install cd .. cd .. - cd .. -cd .. - - - -#compile -./src/catkin/bin/catkin_make_isolated - - -#install -mkdir -p %{buildroot}/opt/ros/melodic/ -cp -r devel_isolated/* %{buildroot}/opt/ros/melodic/ - -echo %{buildroot} +./src/catkin/bin/catkin_make_isolated --install + +#### +# 对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/ +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/melodic/* -/opt/ros/melodic/* -#/usr/lib/share/catkin/cmake/* - +%defattr(-,root,root) +/opt/ros/noetic/* +/opt/ros/noetic/.rosinstall +/opt/ros/noetic/.catkin +/usr/local/* %changelog -* Thu May 28 2020 openEuler Buildteam - 19.4-1 +* Thu 12-15-2020 openEuler Buildteam - Package init - diff --git a/pluginlib.yaml b/pluginlib.yaml new file mode 100644 index 0000000000000000000000000000000000000000..69f980fad5dfe34fa58e981146d3ed9aaa70a204 --- /dev/null +++ b/pluginlib.yaml @@ -0,0 +1,5 @@ +--- +version_control: git +src_repo: https://github.com/ros/pluginlib.git +tag_prefix: 1.13.0-1 +separator: "."