Explicitly require make

This reverts commit 38e20bdffd.

cmake.spec

@@ -66,8 +66,8 @@
 %global orig_name cmake
 
 Name:           %{orig_name}%{?name_suffix}
-Version:        %{major_version}.%{minor_version}.3
-Release:        1%{?relsuf}%{?dist}
+Version:        %{major_version}.%{minor_version}.4
+Release:        2%{?relsuf}%{?dist}
 Summary:        Cross-platform make system
 
 # most sources are BSD
@@ -174,6 +174,9 @@ Requires:       %{name}-data = %{version}-%{release}
 Requires:       %{name}-rpm-macros = %{version}-%{release}
 Requires:       %{name}-filesystem%{?_isa} = %{version}-%{release}
 
+# Explicitly require make.  (rhbz#1862014)
+Requires:       make
+
 # Provide the major version name
 Provides: %{orig_name}%{major_version} = %{version}-%{release}
 
@@ -493,6 +496,26 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
 
 
 %changelog
+* Wed Sep 30 13:05:42 CEST 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.4-2
+- Make %ctest non-verbose by default
+- Explicitly require make
+
+* Sat Aug 01 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.4-1
+- Update to cmake-3.17.4
+
+* Wed Jul 29 2020 Orion Poplawski <orion@nwra.com> - 3.17.3-5
+- Handle arguments for ctest3 macro
+
+* Wed Jul 22 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.3-4
+- Default to --verbose for ctest as well
+
+* Sun Jul 19 2020 Neal Gompa <ngompa13@gmail.com> - 3.17.3-3
+- Make in-source builds behave like before
+
+* Fri Jul 03 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.17.3-2
+- Add %%cmake_build/%%cmake_install/%%ctest macros
+- Add %%__cmake_in_source_build macro to control in-source/out-of-source builds
+
 * Fri May 29 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.3-1
 - Update to cmake-3.17.3
 

macros.cmake

@@ -6,6 +6,9 @@
 %_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
 %_cmake_version @@CMAKE_VERSION@@
 %__cmake /usr/bin/cmake
+%__ctest /usr/bin/ctest
+%__cmake_in_source_build 1
+%__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.}
 
 # - Set default compile flags
 # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables
@@ -24,6 +27,8 @@
   %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
 %endif \
   %__cmake \\\
+        %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\
+        %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\
         -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
         -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
         -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
@@ -36,6 +41,21 @@
 %if "%{?_lib}" == "lib64" \
         %{?_cmake_lib_suffix64} \\\
 %endif \
-	%{?_cmake_shared_libs}
+        %{?_cmake_shared_libs}
+
+%cmake_build \
+  %__cmake --build "%{__cmake_builddir}" %{?_smp_mflags} --verbose
+
+%cmake_install \
+  DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
+
+%ctest(:-:) \
+  cd "%{__cmake_builddir}" \
+  %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \
+  cd -
+
 
 %cmake@@CMAKE_MAJOR_VERSION@@ %cmake
+%cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build
+%cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install
+%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**}

sources

@@ -1 +1 @@
-SHA512 (cmake-3.17.3.tar.gz) = 13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69
+SHA512 (cmake-3.17.4.tar.gz) = 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e