packages: rpm-build-macros/rpm.macros - add -f EXTENSION and -i to undos macro

glen glen at pld-linux.org
Wed May 26 23:56:16 CEST 2010


Author: glen                         Date: Wed May 26 21:56:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add -f EXTENSION and -i to undos macro

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

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.564 packages/rpm-build-macros/rpm.macros:1.565
--- packages/rpm-build-macros/rpm.macros:1.564	Thu May 20 20:56:35 2010
+++ packages/rpm-build-macros/rpm.macros	Wed May 26 23:56:10 2010
@@ -1823,16 +1823,30 @@
 # Undos files
 #
 # Author: Paweł Zuzelski <pawelz at pld-linux.org>
+# Author: Elan Ruusamäe <glen at pld-linux.org>
 #
 # Usage:
 #   %undos list_of_files
+#   %undos -f EXT[,EXT]
+#   %undos -i -f EXT[,EXT]
+#
+#  -f EXT[,EXT] - find(1) files by extensions
+#  -i - case insensitive file search
+#
+# Example:
+#   Un-DOS all *.js, *.css files
+#   %undos -f js,css
+#   Un-DOS all *.js, *.JS files
+#   %undos -f js -i
+#   undos all Makefiles
+#   %{__find} -name Makefile | xargs %undos
 #
 # Requirements:
 # BuildRequires:	sed >= 4.0
 # BuildRequires:	rpmbuild(macros) >= 1.553
 
-# NB: make sure this command stays on one line
-%undos		%{__sed} -i -e 's,\\r$,,'
+# 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$,,'
 
 # 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.564&r2=1.565&f=u



More information about the pld-cvs-commit mailing list