From 19a8bafd89e29bff5eeb8f2ab571228ffb2464c03ced1593eb26f961a7e49315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 2 Jul 2014 08:57:25 +0000 Subject: [PATCH] Accepting request 239256 from home:sleep_walker:branches:devel:tools:building - reduce number of sed calls in %cmake RPM macro OBS-URL: https://build.opensuse.org/request/show/239256 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=161 --- cmake.changes | 5 +++++ cmake.macros | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake.changes b/cmake.changes index 73951db..78478e7 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 2 08:25:13 UTC 2014 - sleep_walker@suse.cz + +- reduce number of sed calls in %cmake RPM macro + ------------------------------------------------------------------- Tue Jul 1 10:52:47 UTC 2014 - dvaleev@suse.com diff --git a/cmake.macros b/cmake.macros index 60f0c3f..969ee66 100644 --- a/cmake.macros +++ b/cmake.macros @@ -9,10 +9,7 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ find . -name CMakeLists.txt \\\ - -exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE.*)/{s/^/#IGNORE /g}' {} + \\\ - -exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE.*)/{s/^/#IGNORE /g}' {} + \\\ - -exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX.*)/{s/^/#IGNORE /g}' {} + \\\ - -exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE.*)/{s/^/#IGNORE /g}' {} + \ + -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 build \ cd build \ %define enable_debug 1 \