rpm/findlang.diff

SUSE patches for find-lang.

--- ./scripts/find-lang.sh.orig	2004-06-20 18:55:19.000000000 +0000
+++ ./scripts/find-lang.sh	2005-12-19 15:22:52.000000000 +0000
@@ -28,10 +28,10 @@ the top of the tree containing the files
 PACKAGE_NAME is the %{name} of the package. This should also be
 the basename of the .mo files.  the output is written to
 PACKAGE_NAME.lang unless \$3 is given in which case output is written
-to \$3.
+to \$3 (note, that \$3 is appended to if given).
 Additional options:
-  --with-gnome		find GNOME help files
-  --with-kde		find KDE help files
+  --without-gnome	find GNOME help files
+  --without-kde		find KDE help files
   --all-name		match all package/domain names
   --without-mo		not find locales files
 EOF
@@ -52,8 +52,8 @@ else NAME=$1
 fi
 shift
 
-GNOME=#
-KDE=#
+GNOME=
+KDE=
 MO=
 MO_NAME=$NAME.lang
 ALL_NAME=#
@@ -61,12 +61,12 @@ NO_ALL_NAME=
 
 while test $# -gt 0 ; do
     case "${1}" in
-	--with-gnome )
-  		GNOME=
+	--without-gnome )
+  		GNOME=#
 		shift
 		;;
-	--with-kde )
-		KDE=
+	--without-kde )
+		KDE=#
 		shift
 		;;
 	--without-mo )
@@ -85,26 +85,43 @@ while test $# -gt 0 ; do
     esac
 done    
 
-find $TOP_DIR -type f|sed '
+
+if ! test -s $MO_NAME ; then
+    echo "%defattr (644, root, root, 755)" > $MO_NAME
+fi
+
+MO_NAME_NEW=$MO_NAME.tmp.$$
+rm -f $MO_NAME_NEW
+
+find $TOP_DIR -type f -o -type l|sed '
 s:'"$TOP_DIR"'::
 '"$ALL_NAME$MO"'s:\(.*/share/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
 '"$NO_ALL_NAME$MO"'s:\(.*/share/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) \1\2\3:
 s:^\([^%].*\)::
 s:%lang(C) ::
-/^$/d' > $MO_NAME
+/^ *$/d' >> $MO_NAME_NEW
+
+find $TOP_DIR -type f -o -type l|sed '
+s:'"$TOP_DIR"'::
+/\/share\/locale\//d
+'"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\([^/]*\)\(.*\)/LC_MESSAGES/.*\.mo$:%lang(\2) %doc \1\2\3\4:
+'"$NO_ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\([^/]*\)\(.*\)/LC_MESSAGES/'"$NAME"'\.mo$:%lang(\2) %doc \1\2\3\4:
+s:^\([^%].*\)::
+s:%lang(C) ::
+/^ *$/d' >> $MO_NAME_NEW
 
 find $TOP_DIR -type d|sed '
 s:'"$TOP_DIR"'::
-'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir \1:
+'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir %doc \1:
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'/[a-zA-Z0-9.\_\-]/.\+\)::
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'\/\)\([^/_]\+\):%lang(\2) \1\2:
-'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+$\):%dir \1:
+'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+$\):%dir %doc \1:
 '"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]/.\+\)::
-'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+\/\)\([^/_]\+\):%lang(\2) \1\2:
+'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+\/\)\([^/_]\+\):%lang(\2) %doc \1\2:
 s:%lang(.*) .*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*::
 s:^\([^%].*\)::
 s:%lang(C) ::
-/^$/d' >> $MO_NAME
+/^ *$/d' >> $MO_NAME_NEW
 
 find $TOP_DIR -type d|sed '
 s:'"$TOP_DIR"'::
@@ -112,12 +129,20 @@ s:'"$TOP_DIR"'::
 '"$NO_ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3:
 '"$ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::
 '"$ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
+'"$NO_ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\)::
+'"$NO_ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) %doc \1\2\3:
+'"$ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::
+'"$ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) %doc \1\2\3:
 s:^\([^%].*\)::
 s:%lang(C) ::
-/^$/d' >> $MO_NAME
+/^ *$/d' >> $MO_NAME_NEW
 
-if ! grep -q / $MO_NAME; then
+if ! grep -q / $MO_NAME_NEW ; then
 	echo "No translations found for ${NAME} in ${TOP_DIR}"
+	rm -f $MO_NAME_NEW
 	exit 1
+else
+	sort -u $MO_NAME_NEW >> $MO_NAME
+	rm -f $MO_NAME_NEW
 fi
 exit 0