diff --git a/catkin-0.7.26.tar.gz b/catkin-0.7.26.tar.gz index 25e78c075d9392efb234c15ea42a8e46640c4929..95d7c6010e0d5ba38f6aff225cf44c9f614787a4 100644 Binary files a/catkin-0.7.26.tar.gz and b/catkin-0.7.26.tar.gz differ diff --git a/catkin.spec b/catkin.spec old mode 100755 new mode 100644 index 89990f11b7362e11b46ae73521cd6fcfc36c010b..0f28b7acb8936fa2df421d973d1f0c6ff96c977a --- a/catkin.spec +++ b/catkin.spec @@ -7,7 +7,7 @@ URL: https://github.com/ros-gbp/catkin-release/archive/release/melodic/catkin Source0: https://github.com/ros-gbp/catkin-release/archive/release/melodic/catkin-0.7.26.tar.gz BuildRequires: gcc-c++ BuildRequires: cmake -#BuildRequires: python-empy +BuildRequires: python-devel #BuildRequires: libpng-devel #BuildRequires: libjpeg-turbo-devel #BuildRequires: gcc-gfortran @@ -22,21 +22,62 @@ BuildRequires: cmake This is ROS melodic Catkin Package include catkin_make, catkin_init_workspace, and so on. %prep -%setup -q +%setup +#cd catkin-0.7.26/ + + + #%build +#pwd +#mkdir build/ +#cd build/ && cmake .. + + %install +pwd + +cd empy-3.3.4/ +sudo python setup.py install +cd .. +mkdir -p build/ +cd build/ +cmake .. +cd .. +mkdir -p %{buildroot}/usr/bin/ +install -m 777 bin/catkin_make %{buildroot}/usr/bin/catkin_make +install -m 777 bin/catkin_init_workspace %{buildroot}/usr/bin/catkin_init_workspace +install -m 777 bin/catkin_find %{buildroot}/usr/bin/catkin_find +install -m 777 bin/catkin_make_isolated %{buildroot}/usr/bin/catkin_make_isolated +install -m 777 bin/catkin_test_results %{buildroot}/usr/bin/catkin_test_results +install -m 777 bin/catkin_topological_order %{buildroot}/usr/bin/catkin_topological_order +mkdir -p %{buildroot}/usr/lib/share/catkin/cmake/ +cp -r cmake/ %{buildroot}/usr/lib/share/catkin/ +#install -m 777 cmake/templates/setup.bash.in %{buildroot}/opt/ros/melodic/setup.bash +#install -m 777 cmake/templates/env.sh.in %{buildroot}/opt/ros/melodic/env.sh -%files -%defattr(-,root,root) +mkdir -p %{buildroot}/opt/ros/melodic/cmake/ +cp -r build/* %{buildroot}/opt/ros/melodic/ + + +mkdir -p %{buildroot}/opt/ros/melodic/share/catkin/cmake/ +cp -r cmake/ %{buildroot}/opt/ros/melodic/share/catkin/ + + +echo %{buildroot} + +%files +#%defattr(-,root,root) +/opt/ros/melodic/* +/usr/bin/* +/usr/lib/share/catkin/cmake/* %changelog * Thu May 28 2020 openEuler Buildteam - 19.4-1 - Package init -