X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-find-lang;h=16d73a77c5785b52da63156283ad75743314d832;hb=20884491992cbd8f598da17754e11ab9af8c2d34;hp=62d6937838312f5aa96668ebdc2fb8616d633ffb;hpb=b980975fbb1a9c2adf177cd2c5eb5f42fe14d7ae;p=packages%2Frpm-build-macros.git

diff --git a/rpm-find-lang b/rpm-find-lang
index 62d6937..16d73a7 100644
--- a/rpm-find-lang
+++ b/rpm-find-lang
@@ -13,6 +13,8 @@
 
 #changes:
 # $Id$
+# 2006-08-28 Elan Ruusamäe <glen@pld-linux.org>
+#   * fixed --all-name which got broken with last change.
 # 2006-08-09 Elan Ruusamäe <glen@pld-linux.org>
 #   * huge performance boost for packages calling %find_lang multiple times (kde*i18n)
 # 2001-01-08 Micha³ Kochanowicz <mkochano@pld.org.pl>
@@ -111,7 +113,7 @@ if [ ! -f __find.files ]; then
 		s:'"$TOP_DIR"'::' > __find.files
 fi
 
-fgrep $NAME __find.files | sed '
+{ [ "$ALL_NAME" ] || cat __find.files && fgrep $NAME __find.files; } | sed '
 '"$ALL_NAME$MO"'s:\(.*/share/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
 '"$NO_ALL_NAME$MO"'s:\(.*/share/locale/\)\([^/]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) \1\2\3:
 s:^\([^%].*\)::
@@ -121,7 +123,7 @@ s:^\$::' | egrep -v '^$' >> $MO_NAME
 if [ ! -f __find.dirs ]; then
 	find $TOP_DIR -type d | sed 's:'"$TOP_DIR"'::' > __find.dirs
 fi
-fgrep $NAME __find.dirs | sed '
+{ [ "$ALL_NAME" ] || cat __find.dirs && fgrep $NAME __find.dirs; } | sed '
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir \1:
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'/[a-zA-Z0-9.\_\-]/.\+\)::
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'\/\)\([^/]\+\):%lang(\2) \1\2:
@@ -132,7 +134,7 @@ s:%lang(.*) .*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*::
 s:^\([^%].*\)::
 s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
 
-fgrep $NAME __find.dirs | sed '
+{ [ "$ALL_NAME" ] || cat __find.dirs && fgrep $NAME __find.dirs; } | sed '
 '"$NO_ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\)::
 '"$NO_ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3:
 '"$ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::