diff --git a/cmake.spec b/cmake.spec index e5cdf9a..750255a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 0.2 +%global baserelease 0.3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -531,6 +531,10 @@ popd %changelog +* Sun Oct 30 2022 Björn Esser - 3.25.0-0.3.rc2 +- Allow valid short arguments for %%ctest macro + Fixes rhbz#2127650 + * Sun Oct 30 2022 Björn Esser - 3.25.0-0.2.rc2 - Drop non-upstream CMAKE_DL_LIBS windows patch Fixes rhbz#2127529 diff --git a/macros.cmake b/macros.cmake index 54598ee..257f0bd 100644 --- a/macros.cmake +++ b/macros.cmake @@ -50,7 +50,7 @@ %cmake_install \ DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}" -%ctest(:-:) \ +%ctest(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \ cd "%{__cmake_builddir}" \ %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \ cd - @@ -59,4 +59,5 @@ %cmake@@CMAKE_MAJOR_VERSION@@ %cmake %cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build %cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install -%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**} +%ctest@@CMAKE_MAJOR_VERSION@@(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \ + %ctest %{**}