[packages/rpm-build-macros] v1.706: find-lang: v1.37 update --with-qm to accept from any path

[glen]

commit 59c9ed8f8968ff427964670e3d782ac458ef5d38
Author: Elan Ruusamäe <g...@delfi.ee>
Date:   Sun Jan 25 14:57:28 2015 +0200

    v1.706: find-lang: v1.37 update --with-qm to accept from any path
    
    sed patterns from rpm.org
    315d491514c1b710b53c40aa8bf03eb56c202a36

 find-lang.sh          | 10 +++++++---
 rpm-build-macros.spec |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 63a5426..aa5ad13 100644
--- 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
diff --git a/find-lang.sh b/find-lang.sh
index 9bf6895..a2b50e7 100755
--- 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
 
================================================================

---- gitweb:

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

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit