Hello community,
here is the log from the commit of package update-desktop-files for
openSUSE:Factory checked in at 2014-07-26 11:27:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
and /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "update-desktop-files"
Changes:
--------
---
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2014-07-02 15:04:31.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
2014-07-26 11:27:54.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 24 11:59:42 UTC 2014 - [email protected]
+
+- handle symlinks, fix quoting problems and unnecessary use of grep
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ brp-trim-desktop.sh ++++++
--- /var/tmp/diff_new_pack.91sfwC/_old 2014-07-26 11:27:55.000000000 +0200
+++ /var/tmp/diff_new_pack.91sfwC/_new 2014-07-26 11:27:55.000000000 +0200
@@ -23,7 +23,7 @@
fi
find /$RPM_BUILD_ROOT/usr/share /$RPM_BUILD_ROOT/etc/xdg/autostart/ \
- -name *.desktop -o -name .directory 2>/dev/null | while read FILE; do
+ -type -f \( -name '*.desktop' -o -name .directory \) 2>/dev/null | while
read -r FILE; do
if grep -q ^X-SuSE-translate= "$FILE"; then
echo "DEBUG: $FILE contains X-SuSE-translate - skipping" >&2
@@ -31,9 +31,9 @@
fi
# save for backup
- NFILE=${FILE#$RPM_BUILD_ROOT}
+ NFILE="${FILE#$RPM_BUILD_ROOT}"
echo "<<$NFILE>>" >> $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
- cat $FILE >> $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
+ cat "$FILE" >> $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
# make sure we end with a newline
echo >> $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
echo "trimmed output to $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles"
@@ -41,10 +41,7 @@
#
# Trim translations (desktops will use gettext to find them)
#
- grep -v -E '^Name\[|^GenericName\[|^Comment\[' $FILE > ${FILE}_
- sed -i -e '/^\[Desktop Entry\]/a \
-X-SuSE-translate=true' ${FILE}_
- mv ${FILE}_ $FILE
-
+ sed -e '/^\(Name\[\|GenericName\[\|Comment\[\)/d' -e '/^\[Desktop
Entry\]/a \
+X-SuSE-translate=true' "$FILE" > "${FILE}_" && mv "${FILE}_" "$FILE"
done
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
