--- ./scripts/find-lang.sh.orig	2019-09-09 07:56:53.377788842 +0000

+++ ./scripts/find-lang.sh	2019-10-02 11:12:53.774861485 +0000

@@ -22,11 +22,11 @@ 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

+  --without-gnome	do not find GNOME help files

   --with-mate		find MATE help files

-  --with-kde		find KDE help files

+  --without-kde		do not find KDE help files

   --with-qt		find Qt translation files

   --with-html		find HTML files

   --with-man		find localized man pages

@@ -50,9 +50,9 @@ else NAMES[0]=$1

 fi

 shift

-GNOME=#

+GNOME=

 MATE=#

-KDE=#

+KDE=

 QT=#

 MAN=#

 HTML=#

@@ -74,6 +74,14 @@ while test $# -gt 0 ; do

 		KDE=

 		shift

 		;;

+	--without-gnome )

+  		GNOME=#

+		shift

+		;;

+	--without-kde )

+		KDE=#

+		shift

+		;;

 	--with-qt )

 		QT=

 		shift

@@ -103,11 +111,13 @@ while test $# -gt 0 ; do

 		shift

 		;;

     esac

-done    

+done

-if [ -f $MO_NAME ]; then

-    rm $MO_NAME

+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

 for NAME in ${NAMES[@]}; do

@@ -117,7 +127,7 @@ s:'"$TOP_DIR"'::

 '"$NO_ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) \1\2\3:

 s:^\([^%].*\)::

 s:%lang(C) ::

-/^$/d' >> $MO_NAME

+/^$/d' >> $MO_NAME_NEW

 find "$TOP_DIR" -type d|sed '

 s:'"$TOP_DIR"'::

@@ -125,27 +135,27 @@ s:'"$TOP_DIR"'::

 '"$ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/_]\+\)\([^/]*\)\(/[a-zA-Z0-9.\_\-]\+\)$:%lang(\2) %doc \1\2\3\4/:

 s:^\([^%].*\)::

 s:%lang(C) ::

-/^$/d' >> $MO_NAME

+/^$/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:

+'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'\/\)\([^/_]\+\):%lang(\2) %doc \1\2:

+'"$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"'::

 '"$NO_ALL_NAME$GNOME"'s:\(.*/omf/'"$NAME"'$\):%dir \1:

 '"$ALL_NAME$GNOME"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+$\):%dir \1:

 s:^\([^%].*\)::

-/^$/d' >> $MO_NAME

+/^$/d' >> $MO_NAME_NEW

 find "$TOP_DIR" -type f|sed '

 s:'"$TOP_DIR"'::

@@ -153,7 +163,7 @@ s:'"$TOP_DIR"'::

 '"$ALL_NAME$GNOME"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+-\([^/.]\+\)\.omf\):%lang(\2) \1:

 s:^[^%].*::

 s:%lang(C) ::

-/^$/d' >> $MO_NAME

+/^$/d' >> $MO_NAME_NEW

 find $TOP_DIR -type d|sed '

 s:'"$TOP_DIR"'::

@@ -166,14 +176,14 @@ s:'"$TOP_DIR"'::

 s:%lang(.*) .*/mate/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"'::

 '"$NO_ALL_NAME$MATE"'s:\(.*/omf/'"$NAME"'$\):%dir \1:

 '"$ALL_NAME$MATE"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+$\):%dir \1:

 s:^\([^%].*\)::

-/^$/d' >> $MO_NAME

+/^$/d' >> $MO_NAME_NEW

 find "$TOP_DIR" -type f|sed '

 s:'"$TOP_DIR"'::

@@ -181,7 +191,7 @@ s:'"$TOP_DIR"'::

 '"$ALL_NAME$MATE"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+-\([^/.]\+\)\.omf\):%lang(\2) \1:

 s:^[^%].*::

 s:%lang(C) ::

-/^$/d' >> $MO_NAME

+/^$/d' >> $MO_NAME_NEW

 KDE3_HTML=`kde-config --expandvars --install html 2>/dev/null`

 if [ x"$KDE3_HTML" != x ] && [ -d "$TOP_DIR$KDE3_HTML" ]; then

@@ -193,7 +203,7 @@ s:'"$TOP_DIR"'::

 '"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:

 s:^\([^%].*\)::

 s:%lang(C) ::

-/^$/d' >> $MO_NAME

+/^$/d' >> $MO_NAME_NEW

 fi

 KDE4_HTML=`kde4-config --expandvars --install html 2>/dev/null`

@@ -206,7 +216,7 @@ s:'"$TOP_DIR"'::

 '"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:

 s:^\([^%].*\)::

 s:%lang(C) ::

-/^$/d' >> $MO_NAME

+/^$/d' >> $MO_NAME_NEW

 fi

 KF5_HTML=`kf5-config --expandvars --install html 2>/dev/null`

@@ -219,7 +229,7 @@ s:'"$TOP_DIR"'::

 '"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:

 s:^\([^%].*\)::

 s:%lang(C) ::

-/^$/d' >> $MO_NAME

+/^$/d' >> $MO_NAME_NEW

 fi

 find "$TOP_DIR" -type d|sed '

@@ -230,7 +240,7 @@ s:'"$TOP_DIR"'::

 '"$ALL_NAME$HTML"'s:\(.*/doc/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%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"'::

@@ -243,7 +253,7 @@ s:'"$TOP_DIR"'::

 '"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:

 s:^[^%].*::

 s:%lang(C) ::

-/^$/d' >> $MO_NAME

+/^$/d' >> $MO_NAME_NEW

 find "$TOP_DIR" -type d|sed '

 s:'"$TOP_DIR"'::

@@ -251,19 +261,24 @@ s:'"$TOP_DIR"'::

 '"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1*:

 s:^\([^%].*\)::

 s:%lang(C) ::

-/^$/d' >> $MO_NAME

+/^$/d' >> $MO_NAME_NEW

 find "$TOP_DIR" -type f -o -type l|sed -r 's/\.(bz2|gz|xz|lzma|Z)$//g' | sed '

 s:'"$TOP_DIR"'::

 '"$NO_ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/'"$NAME"'\.[a-z0-9].*\):%lang(\2) \1*:

 s:^\([^%].*\)::

 s:%lang(C) ::

-/^$/d' >> $MO_NAME

+/^$/d' >> $MO_NAME_NEW

 done # for NAME in ${NAMES[@]}

-if ! grep -q / $MO_NAME; then

-	echo "No translations found for ${NAME} in ${TOP_DIR}"

+if ! grep -q / $MO_NAME_NEW; then

+	echo "No translations found for ${NAMES[*]} in ${TOP_DIR}"

+	rm -f $MO_NAME_NEW

 	exit 1

 fi

+

+sort -u $MO_NAME_NEW >> $MO_NAME

+rm -f $MO_NAME_NEW

+

 exit 0