Compare commits

..

No commits in common. "e9ed3465c66a92623ef102528eb6ea647ff2de69" and "341905c9265224367b0a4076348e4af6b80d8db4" have entirely different histories.

View File

@ -1,6 +1,6 @@
Name: nodelet_core
Name: ros-noetic-ros-nodelet_core
Version: 1.10.1
Release: 2
Release: 1
Summary: This is ROS noetic %{name} 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/nodelet_core-release/archive/release/noetic/nodelet_core
@ -23,6 +23,10 @@ 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
@ -31,7 +35,7 @@ BuildRequires: gmock-devel
This is %{name} Package
%prep
%setup -q -n ros-noetic-ros-%{name}-%{version}
%setup
%install
@ -82,32 +86,32 @@ 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 Apr 09 2024 zhangxianting <zhangxianting@uniontech.com> - 1.10.1-2
- point source patch at prep
* Tue Dec 15 2020 openEuler Buildteam <hanhaomin008@126.com> - 1.10.1-1
- Package init