RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Matthew Dawkins
Root: /v/rpm/cvs Email: mdawk...@rpm5.org
Module: rpm Date: 08-May-2012 02:18:12
Branch: rpm-5_4 Handle: 2012050800181100
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/scripts find-lang.sh
Log:
applied mdv patch rpm-5.4.4-find_lang-support-multiple-names.patch
Submitted by: mdawkins
Summary:
Revision Changes Path
1.3501.2.273+1 -0 rpm/CHANGES
1.10.8.4 +15 -4 rpm/scripts/find-lang.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.272 -r1.3501.2.273 CHANGES
--- rpm/CHANGES 8 May 2012 00:16:10 -0000 1.3501.2.272
+++ rpm/CHANGES 8 May 2012 00:18:11 -0000 1.3501.2.273
@@ -1,4 +1,5 @@
5.4.8 -> 5.4.9:
+ - mdawkins: applied mdv patch
rpm-5.4.4-find_lang-support-multiple-names.patch
- mdawkins: applied mdv patch rpm-5.4.4-find_lang-with-html.patch
- mdawkins: applied mdv patch
rpm-5.4.4-merge-find-lang.sh-changes-from-rpm.org.patch
- find_lang:
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/find-lang.sh
============================================================================
$ cvs diff -u -r1.10.8.3 -r1.10.8.4 find-lang.sh
--- rpm/scripts/find-lang.sh 8 May 2012 00:16:11 -0000 1.10.8.3
+++ rpm/scripts/find-lang.sh 8 May 2012 00:18:11 -0000 1.10.8.4
@@ -13,6 +13,7 @@
# 2011-11-16 Per Ãyvind Karlsen <peroyv...@mandriva.org>
# * add support for HTML files (from Mandriva)
+# * add support for multiple names
# 2004-06-20 Arkadiusz MiÅkiewicz <ar...@pld-linux.org>
# * merge PLD changes, kde, all-name (mkochano,pascalek@PLD)
# 1999-10-19 Artur Frysiak <wi...@pld-linux.org>
@@ -53,7 +54,7 @@
shift
if [ -z "$1" ] ; then usage
-else NAME=$1
+else NAMES[0]=$1
fi
shift
@@ -63,10 +64,9 @@
MAN=#
HTML=#
MO=
-MO_NAME=$NAME.lang
+MO_NAME=${NAMES[0]}.lang
ALL_NAME=#
NO_ALL_NAME=
-
while test $# -gt 0 ; do
case "${1}" in
--with-gnome )
@@ -99,19 +99,28 @@
shift
;;
* )
+ if [ $MO_NAME != $NAME.lang ]; then
+ NAMES[${#NAMES[@]}]=$MO_NAME
+ fi
MO_NAME=${1}
shift
;;
esac
done
+if [ -f $MO_NAME ]; then
+ rm $MO_NAME
+fi
+
+for NAME in ${NAMES[@]}; do
+
find "$TOP_DIR" -type f -o -type l|sed '
s:'"$TOP_DIR"'::
'"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
'"$NO_ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2)
\1\2\3:
s:^\([^%].*\)::
s:%lang(C) ::
-/^$/d' > $MO_NAME
+/^$/d' >> $MO_NAME
find "$TOP_DIR" -type d|sed '
s:'"$TOP_DIR"'::
@@ -203,6 +212,8 @@
s:%lang(C) ::
/^$/d' >> $MO_NAME
+done
+
if ! grep -q / $MO_NAME; then
echo "No translations found for ${NAME} in ${TOP_DIR}"
exit 1
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
