From e88273a269806e0fb6a18f1116c04d4798ddcd52a6c27e95a6c3bafc41575b5d Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Sun, 3 Jul 2022 12:07:34 +0000 Subject: [PATCH] Accepting request 986334 from home:cgiboudeaux:branches:devel:tools:building - Fix the %%cmake macro which tried to run sed on 'CMakeLists.txt' without making sure it's not a folder. Found while fixing the liboqs package which has a folder named CMakeLists.txt OBS-URL: https://build.opensuse.org/request/show/986334 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=494 --- cmake.changes | 6 ++++++ cmake.macros | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake.changes b/cmake.changes index b3fc3b6..56b1e23 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 2 07:32:54 UTC 2022 - Christophe Giboudeaux + +- Fix the %%cmake macro which tried to run sed on 'CMakeLists.txt' + without making sure it's not a folder. + ------------------------------------------------------------------- Sun Jun 5 00:03:22 UTC 2022 - Dirk Müller diff --git a/cmake.macros b/cmake.macros index 42ef8f5..3bf4da2 100644 --- a/cmake.macros +++ b/cmake.macros @@ -8,7 +8,7 @@ %__sourcedir . %cmake \ - find %__sourcedir -name CMakeLists.txt \\\ + find %__sourcedir -type f -name CMakeLists.txt \\\ -exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\\\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\\\)/{s/^/#IGNORE /}' {} + \ mkdir -p %__builddir \ cd %__builddir \