packages: rpm-build-macros/rpm.macros - eol for undos

glen glen at pld-linux.org
Tue Jun 1 17:03:06 CEST 2010


Author: glen                         Date: Tue Jun  1 15:03:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- eol for undos

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.565 -> 1.566) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.565 packages/rpm-build-macros/rpm.macros:1.566
--- packages/rpm-build-macros/rpm.macros:1.565	Wed May 26 23:56:10 2010
+++ packages/rpm-build-macros/rpm.macros	Tue Jun  1 17:02:58 2010
@@ -1843,10 +1843,12 @@
 #
 # 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.
 #
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.565&r2=1.566&f=u



More information about the pld-cvs-commit mailing list