update spec macros for CMake builds

Author: christianrauch

bloom/generators/rpm/templates/ament_cmake/template.spec.em

@@ -39,7 +39,7 @@ Source0:        %{name}-%{version}.tar.gz
 # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
 if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi
 mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform}
-%cmake3 \
+%cmake \
     -UINCLUDE_INSTALL_DIR \
     -ULIB_INSTALL_DIR \
     -USYSCONF_INSTALL_DIR \
@@ -54,14 +54,14 @@ mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform}
 %endif
     ..
 
-%make_build
+%cmake_build
 
 %install
 # In case we're installing to a non-standard location, look for a setup.sh
 # in the install tree and source it.  It will set things like
 # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
 if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi
-%make_install -C .obj-%{_target_platform}
+%cmake_install
 
 %if 0%{?with_tests}
 %check
@@ -73,7 +73,7 @@ if [ -n "$TEST_TARGET" ]; then
 # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
 if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi
 CTEST_OUTPUT_ON_FAILURE=1 \
-    %make_build -C .obj-%{_target_platform} $TEST_TARGET || echo "RPM TESTS FAILED"
+    %cmake_build -C .obj-%{_target_platform} $TEST_TARGET || echo "RPM TESTS FAILED"
 else echo "RPM TESTS SKIPPED"; fi
 %endif
 

bloom/generators/rpm/templates/cmake/template.spec.em

@@ -39,7 +39,7 @@ Source0:        %{name}-%{version}.tar.gz
 # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
 if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi
 mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform}
-%cmake3 \
+%cmake \
     -UINCLUDE_INSTALL_DIR \
     -ULIB_INSTALL_DIR \
     -USYSCONF_INSTALL_DIR \
@@ -53,14 +53,14 @@ mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform}
 %endif
     ..
 
-%make_build
+%cmake_build
 
 %install
 # In case we're installing to a non-standard location, look for a setup.sh
 # in the install tree and source it.  It will set things like
 # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
 if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi
-%make_install -C .obj-%{_target_platform}
+%cmake_install
 
 %if 0%{?with_tests}
 %check
@@ -72,7 +72,7 @@ if [ -n "$TEST_TARGET" ]; then
 # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
 if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi
 CTEST_OUTPUT_ON_FAILURE=1 \
-    %make_build -C .obj-%{_target_platform} $TEST_TARGET || echo "RPM TESTS FAILED"
+    %cmake_build -C .obj-%{_target_platform} $TEST_TARGET || echo "RPM TESTS FAILED"
 else echo "RPM TESTS SKIPPED"; fi
 %endif