- added support for new gnome help location

- release 2

Changed files:
    rpm-build-macros.spec -> 1.300
    rpm-find-lang -> 1.35

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index e8cdb9adabc42a14f2af32c48881a3851aa9d4ef..80c7aa82e24e41f333f0fde49d0806f88db471dd 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,10 +1,10 @@
 %define                rpm_macros_rev  1.619
-%define                find_lang_rev   1.34
+%define                find_lang_rev   1.35
 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:       1
+Release:       2
 License:       GPL
 Group:         Development/Building
 Source0:       rpm.macros

diff --git a/rpm-find-lang b/rpm-find-lang
index a3a19edf1bcc26ab517a48fd39212df1aae055d7..12e47cd4721c1a6d52edbb32ed8d03f8a23e1da2 100644 (file)
--- a/rpm-find-lang
+++ b/rpm-find-lang
@@ -228,8 +228,10 @@ fi
                cat __find.dirs
        fi
 ) | sed '
+'"$NO_ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/]\+\)\(/'"$NAME"'\)$:%lang(\2) \1\2\3:
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir \1:
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'/\)\([^/]\+\)$:%lang(\2) \1\2:
+'"$ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/]\+\)\(/[^/]\+\)$:%lang(\2) \1\2\3:
 '"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[^/]\+$\):%dir \1:
 '"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[^/]\+/\)\([^/]\+\)$:%lang(\2) \1\2:
 /^[^%]/d