[packages/rpm-build-macros] v1.674: %undos find only files when using -f option
glen
glen at pld-linux.org
Mon Sep 23 21:56:25 CEST 2013
commit 9878ac1514fe88b4b6b258aea49880134ea0d8ff
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Sep 23 22:55:54 2013 +0300
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.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/9878ac1514fe88b4b6b258aea49880134ea0d8ff
More information about the pld-cvs-commit
mailing list