From 81a64c94dfe9ca5a37f256f7d521ecf2371489a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 1 Jun 2010 15:02:58 +0000 Subject: [PATCH] - eol for undos Changed files: rpm.macros -> 1.566 --- rpm.macros | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rpm.macros b/rpm.macros index b7b9127..2a101f3 100644 --- a/rpm.macros +++ b/rpm.macros @@ -1843,10 +1843,12 @@ else: \ # # Requirements: # BuildRequires: sed >= 4.0 -# BuildRequires: rpmbuild(macros) >= 1.553 +# BuildRequires: rpmbuild(macros) >= 1.565 # NB: make sure this macro stays on one line -%undos(f:i) %{-f:%{__find} -regextype posix-extended -%{-i:i}regex '^.+\\.(%(echo %{-f*} | tr ',' '|'))$' -print0 | xargs -0} %{__sed} -i -e 's,\\r$,,' +# NB: make sure it includes newline escape +%undos(f:i) %{-f:%{__find} -regextype posix-extended -%{-i:i}regex '^.+\\.(%(echo %{-f*} | tr ',' '|'))$' -print0 | xargs -0} %{__sed} -i -e 's,\\r$,,' %* \ +%{nil} # Hook to register nagios object based plugins in Nagios NRPE daemon config. # -- 2.43.0