diff --git a/python-scikit-build.changes b/python-scikit-build.changes index 6df9e53..cc7123d 100644 --- a/python-scikit-build.changes +++ b/python-scikit-build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 17 05:19:11 UTC 2025 - Steve Kowalik + +- Update patch support-new-cmake.patch: + * Check for a different cache error message. + ------------------------------------------------------------------- Mon Aug 4 02:52:33 UTC 2025 - Steve Kowalik diff --git a/python-scikit-build.spec b/python-scikit-build.spec index 9f27f94..c515fe7 100644 --- a/python-scikit-build.spec +++ b/python-scikit-build.spec @@ -2,7 +2,6 @@ # spec file for package python-scikit-build # # Copyright (c) 2025 SUSE LLC and contributors -# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/support-new-cmake.patch b/support-new-cmake.patch index 1954d99..2f2533e 100644 --- a/support-new-cmake.patch +++ b/support-new-cmake.patch @@ -8,3 +8,16 @@ Index: scikit_build-0.18.1/tests/samples/issue-335-support-cmake-source-dir/CMak project(hello NONE) +Index: scikit_build-0.18.1/tests/test_cmaker.py +=================================================================== +--- scikit_build-0.18.1.orig/tests/test_cmaker.py ++++ scikit_build-0.18.1/tests/test_cmaker.py +@@ -82,7 +82,7 @@ def test_make_without_configure_fails(ca + CMaker().make() + _, err = capfd.readouterr() + assert "An error occurred while building with CMake." in str(excinfo.value) +- assert "Error: could not load cache" in err ++ assert "Error: not a CMake build directory (missing CMakeCache.txt)" in err + + + @pytest.mark.parametrize("configure_with_cmake_source_dir", [True, False])