v1.706: find-lang: v1.37 update --with-qm to accept from any path

sed patterns from rpm.org
315d491514c1b710b53c40aa8bf03eb56c202a36

diff --git a/find-lang.sh b/find-lang.sh
index 9bf689599dc7a3ace3542b0e324198cb1312b255..a2b50e7e2cb79a63444fac9a64de19e94954fdf0 100755 (executable)
--- a/find-lang.sh
+++ b/find-lang.sh
@@ -36,7 +36,7 @@
 #   * start support for KDE help files
 
 PROG=${0##*/}
-VERSION=1.36
+VERSION=1.37
 
 usage () {
 cat <<EOF
@@ -217,8 +217,12 @@ s:%lang(C) ::' >> $MO_NAME
                cat __qm.files
        fi
 ) | sed '
-'"$ALL_NAME$QM"'s:\(.*/share/locale/\)\([^/@]\+\)\(@quot\|@boldquot\)\?\(@[^/]*\)\?\(/.*\.qm$\):%lang(\2\4) \1\2\3\4\5:
-'"$NO_ALL_NAME$QM"'s:\(.*/share/locale/\)\([^/@]\+\)\(@quot\|@boldquot\)\?\(@[^/]*\)\?\(/.*/'"$NAME"'\.qm$\):%lang(\2\4) \1\2\3\4\5:
+'"$NO_ALL_NAME$QM"'s:\(.*/'"$NAME"'_\([a-zA-Z]\{2\}\([_@].*\)\?\)\.qm$\):%lang(\2) \1:
+'"$ALL_NAME$QM"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
+'"$ALL_NAME$QM"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
+'"$ALL_NAME$QM"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
+'"$ALL_NAME$QM"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
+s:^[^%].*::
 /^[^%]/d
 s:%lang(C) ::' >> $MO_NAME
 

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 63a5426007ffb5450f77c10081bd826943d3c744..aa5ad13892c5a25b158e1b31705b7455d9c215cc 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,5 +1,5 @@
-%define                rpm_macros_rev  1.705
-%define                find_lang_rev   1.36
+%define                rpm_macros_rev  1.706
+%define                find_lang_rev   1.37
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros