Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package update-desktop-files for
openSUSE:Factory checked in at 2026-08-12 16:10:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
and /work/SRC/openSUSE:Factory/.update-desktop-files.new.17972 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "update-desktop-files"
Wed Aug 12 16:10:18 2026 rev:108 rq:1370585 version:84.87
Changes:
--------
---
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2026-03-03 15:30:21.363621393 +0100
+++
/work/SRC/openSUSE:Factory/.update-desktop-files.new.17972/update-desktop-files.changes
2026-08-12 16:10:43.533973330 +0200
@@ -1,0 +2,6 @@
+Wed Aug 5 09:36:45 UTC 2026 - Bernhard Wiedemann <[email protected]>
+
+- Quote the build directory paths in suse_update_desktop_file.sh, they
+ break the upstreaming helper when they contain whitespace
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse_update_desktop_file.sh ++++++
--- /var/tmp/diff_new_pack.JGpac1/_old 2026-08-12 16:10:44.250003233 +0200
+++ /var/tmp/diff_new_pack.JGpac1/_new 2026-08-12 16:10:44.254003400 +0200
@@ -253,8 +253,8 @@
# desktop files placed to its build directory.
SUDF_DIR=$RPM_BUILD_DIR
-mkdir -p $SUDF_DIR/suse_update_desktop_file/update-desktop-files/$DESKTOP_NAME
-cp -v "$FILE"
$SUDF_DIR/suse_update_desktop_file/update-desktop-files/$DESKTOP_NAME/$DESKTOP_NAME-upstream.desktop
+mkdir -p
"$SUDF_DIR/suse_update_desktop_file/update-desktop-files/$DESKTOP_NAME"
+cp -v "$FILE"
"$SUDF_DIR/suse_update_desktop_file/update-desktop-files/$DESKTOP_NAME/$DESKTOP_NAME-upstream.desktop"
#END Upstreaming help
#
# update Categories
@@ -378,10 +378,10 @@
TRANSLATION_CHANGES=false
DEADPACKAGE_SUCCESS=false
shopt -s nullglob
-sed '/^\(Name\|GenericName\|Comment\|Keywords\)\[/d' "$FILE"
>$SUDF_DIR/suse_update_desktop_file/update-desktop-files/$DESKTOP_NAME/$DESKTOP_NAME-downstream-no-translation.desktop
+sed '/^\(Name\|GenericName\|Comment\|Keywords\)\[/d' "$FILE"
>"$SUDF_DIR/suse_update_desktop_file/update-desktop-files/$DESKTOP_NAME/$DESKTOP_NAME-downstream-no-translation.desktop"
# Insert translations from the downstream
ORIG_DIR=$PWD
-cd $SUDF_DIR/suse_update_desktop_file/update-desktop-files/$DESKTOP_NAME
+cd "$SUDF_DIR/suse_update_desktop_file/update-desktop-files/$DESKTOP_NAME"
sed '/^\(Name\|GenericName\|Comment\|Keywords\)\[/d'
$DESKTOP_NAME-upstream.desktop >$DESKTOP_NAME-upstream-no-translation.desktop
if [ "$I18N" != "no" ]; then
sed "s@^Name=@_&Name($DESKTOP_NAME.desktop):
@;s@^GenericName=@_&GenericName($DESKTOP_NAME.desktop):
@;s@^Comment=@_&Comment($DESKTOP_NAME.desktop):
@;s@^Keywords=@_&Keywords($DESKTOP_NAME.desktop): @" $FILE
>$DESKTOP_NAME-downstream-no-translation-desktop_translations.desktop
@@ -419,21 +419,21 @@
sed -i
"s@\"\(Name\|GenericName\|Comment\|Keywords\)($DESKTOP_NAME.desktop): @\"@"
po/$DESKTOP_NAME.pot
rm $DESKTOP_NAME-downstream-no-translation-desktop_translations.desktop
$DESKTOP_NAME-downstream-no-translation-desktop_translations.desktop.h
$DESKTOP_NAME-downstream-translated-raw.desktop
mkdir -p deadpackage/po
- if test -d $ORIG_DIR/po ; then
+ if test -d "$ORIG_DIR/po" ; then
echo -n "" >$DESKTOP_NAME-deadpackage-po.diff
echo -n "" >$DESKTOP_NAME-deadpackage-po-upstreamfirst.diff
for PO in po/*.po po/$DESKTOP_NAME.pot ; do
- if test -f $ORIG_DIR/$PO ; then
- msgcat --use-first $PO $ORIG_DIR/$PO -o deadpackage/$PO
- diff -u $ORIG_DIR/$PO deadpackage/$PO
>>$DESKTOP_NAME-deadpackage-po.diff
- msgcat --use-first $ORIG_DIR/$PO $PO -o deadpackage/$PO
- diff -u $ORIG_DIR/$PO deadpackage/$PO
>>$DESKTOP_NAME-deadpackage-po-upstreamfirst.diff
+ if test -f "$ORIG_DIR/$PO" ; then
+ msgcat --use-first $PO "$ORIG_DIR/$PO" -o deadpackage/$PO
+ diff -u "$ORIG_DIR/$PO" deadpackage/$PO
>>$DESKTOP_NAME-deadpackage-po.diff
+ msgcat --use-first "$ORIG_DIR/$PO" $PO -o deadpackage/$PO
+ diff -u "$ORIG_DIR/$PO" deadpackage/$PO
>>$DESKTOP_NAME-deadpackage-po-upstreamfirst.diff
else
diff -u /dev/null $PO >>$DESKTOP_NAME-deadpackage-po.diff
diff -u /dev/null $PO
>>$DESKTOP_NAME-deadpackage-po-upstreamfirst.diff
fi
done
- sed -i 's:^\(---\|\+\+\+\) deadpackage/:\1 :;s:^\(---\|\+\+\+\)
'$ORIG_DIR/':\1 :' $DESKTOP_NAME-deadpackage-po.diff
$DESKTOP_NAME-deadpackage-po-upstreamfirst.diff
+ sed -i 's:^\(---\|\+\+\+\) deadpackage/:\1 :;s:^\(---\|\+\+\+\)
'"$ORIG_DIR"'/:\1 :' $DESKTOP_NAME-deadpackage-po.diff
$DESKTOP_NAME-deadpackage-po-upstreamfirst.diff
DEADPACKAGE_SUCCESS=true
rm -rf deadpackage
fi
@@ -516,7 +516,7 @@
$EOF
-===========================================================================
EOF
-cd $ORIG_DIR
+cd "$ORIG_DIR"
#END Upstreaming help
if [ "$I18N" = "no" ]; then
