[packages/rpm-build-macros] find-lang: use find.dirs after it has been created

[glen]

commit 21e8065a6325f0be7e90d8c5d294cb07e9dadbbf
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Apr 24 01:38:45 2017 +0300

    find-lang: use find.dirs after it has been created

 find-lang.sh          | 13 +++++++------
 rpm-build-macros.spec |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 0de05c1..e1635c4 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -4,7 +4,7 @@ Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
 Name:		rpm-build-macros
 Version:	%{rpm_macros_rev}
-Release:	3
+Release:	4
 License:	GPL
 Group:		Development/Building
 Source0:	rpm.macros
diff --git a/find-lang.sh b/find-lang.sh
index 7befc80..c58441b 100755
--- a/find-lang.sh
+++ b/find-lang.sh
@@ -203,12 +203,6 @@ fi
 /^[^%]/d
 s:%lang(C) ::' >> $MO_NAME
 
-# Django
-cat __find.dirs | sed -r -e '
-'"$DJANGO"'s:(.+/share/python.+/locale/)([^/@]+)(@quot|@boldquot)?(@[^/]*)?$:%lang(\2\4) \1\2\3\4:
-/^[^%]/d
-s:%lang(C) ::' >> $MO_NAME
-
 # .omf
 (
 	if [ "$ALL_NAME" ]; then
@@ -293,6 +287,7 @@ s:%lang(C) ::' >> $MO_NAME
 /^[^%]/d
 s:%lang(C) ::' >> $MO_NAME
 
+# OMF
 (
 	if [ "$ALL_NAME" ]; then
 		grep -F $NAME __find.dirs
@@ -305,6 +300,12 @@ s:%lang(C) ::' >> $MO_NAME
 /^[^%]/d
 s:%lang(C) ::' >> $MO_NAME
 
+# Django
+cat __find.dirs | sed -r -e '
+'"$DJANGO"'s:(.+/share/python.+/locale/)([^/@]+)(@quot|@boldquot)?(@[^/]*)?$:%lang(\2\4) \1\2\3\4:
+/^[^%]/d
+s:%lang(C) ::' >> $MO_NAME
+
 if [ "$(grep -Ev '(^%defattr|^$)' $MO_NAME | wc -l)" -le 0 ]; then
 	echo >&2 "$PROG: Error: international files not found for '$NAME'!"
 	exit 1
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/21e8065a6325f0be7e90d8c5d294cb07e9dadbbf