diff --git a/1.10.1-1.tar.gz b/1.10.1-1.tar.gz index dca4c9b..1ca1d66 100644 Binary files a/1.10.1-1.tar.gz and b/1.10.1-1.tar.gz differ diff --git a/nodelet_core.spec b/nodelet_core.spec index 24ee851..fec9003 100644 --- a/nodelet_core.spec +++ b/nodelet_core.spec @@ -23,10 +23,6 @@ BuildRequires: boost-devel BuildRequires: libtool-ltdl-devel BuildRequires: fltk-devel BuildRequires: libpng-devel -BuildRequires: python3-gpgme -BuildRequires: gpgme-devel -BuildRequires: cpp-gpgme -BuildRequires: python3-crypto BuildRequires: bullet-devel BuildRequires: gtest-devel BuildRequires: gmock-devel @@ -86,31 +82,28 @@ cd .. cd .. #compile -./src/catkin/bin/catkin_make_isolated --install -cp install_dependence.sh install_isolated/ +#./src/catkin/bin/catkin_make_isolated --install +#cp install_dependence.sh install_isolated/ #### # 对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/*` +#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/ +#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/noetic/* -/opt/ros/noetic/.rosinstall -/opt/ros/noetic/.catkin %changelog * Tue Dec 15 2020 openEuler Buildteam - 1.10.1-1