From 9878ac1514fe88b4b6b258aea49880134ea0d8ff Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 23 Sep 2013 22:55:54 +0300 Subject: [PATCH] v1.674: %undos find only files when using -f option --- rpm-build-macros.spec | 2 +- rpm.macros | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec index 74fb4ca..89cdd82 100644 --- a/rpm-build-macros.spec +++ b/rpm-build-macros.spec @@ -5,7 +5,7 @@ %if "%{pld_release}" == "ac" %define with_rpm4 1 %endif -%define rpm_macros_rev 1.673 +%define rpm_macros_rev 1.674 %define find_lang_rev 1.36 Summary: PLD Linux RPM build macros Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD diff --git a/rpm.macros b/rpm.macros index 68037f6..f4fd66b 100644 --- a/rpm.macros +++ b/rpm.macros @@ -2098,11 +2098,11 @@ else: \ # # Requirements: # BuildRequires: sed >= 4.0 -# BuildRequires: rpmbuild(macros) >= 1.565 +# BuildRequires: rpmbuild(macros) >= 1.674 # NB: make sure this macro stays on one line # 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$,,' %* \ +%undos(f:i) %{-f:%{__find} -type f -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.44.0