Hello community,
here is the log from the commit of package update-desktop-files for
openSUSE:Factory checked in at 2020-07-17 20:44:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
and /work/SRC/openSUSE:Factory/.update-desktop-files.new.3592 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "update-desktop-files"
Fri Jul 17 20:44:00 2020 rev:103 rq:821230 version:84.87
Changes:
--------
---
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2019-09-19 15:50:30.091297458 +0200
+++
/work/SRC/openSUSE:Factory/.update-desktop-files.new.3592/update-desktop-files.changes
2020-07-17 20:44:08.352494420 +0200
@@ -1,0 +2,5 @@
+Tue Jun 30 03:21:06 UTC 2020 - Stanislav Brabec <[email protected]>
+
+- Remove GNOME 1 and KDE 3 support (boo#1062631, rpmlint#437).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ update-desktop-files.spec ++++++
--- /var/tmp/diff_new_pack.q4CqC0/_old 2020-07-17 20:44:09.524495669 +0200
+++ /var/tmp/diff_new_pack.q4CqC0/_new 2020-07-17 20:44:09.528495673 +0200
@@ -1,7 +1,7 @@
#
# spec file for package update-desktop-files
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ brp-trim-translations.sh ++++++
--- /var/tmp/diff_new_pack.q4CqC0/_old 2020-07-17 20:44:09.588495737 +0200
+++ /var/tmp/diff_new_pack.q4CqC0/_new 2020-07-17 20:44:09.588495737 +0200
@@ -104,12 +104,8 @@
done
# Handle desktop files
-find "/$RPM_BUILD_ROOT/opt/kde3/share/applications/kde/" \
- "/$RPM_BUILD_ROOT/opt/kde3/share/applnk/" \
- "/$RPM_BUILD_ROOT/usr/share/xsessions/" \
+find "/$RPM_BUILD_ROOT/usr/share/xsessions/" \
"/$RPM_BUILD_ROOT/usr/share/applications/" \
- "/$RPM_BUILD_ROOT/usr/share/mimelnk/" \
- "/$RPM_BUILD_ROOT/usr/share/gnome/apps/" \
"/$RPM_BUILD_ROOT/usr/share/autostart/" \
"/$RPM_BUILD_ROOT/etc/xdg/autostart/" \
"/$RPM_BUILD_ROOT/usr/share/wallpapers/" \
++++++ suse_update_desktop_file.sh ++++++
--- /var/tmp/diff_new_pack.q4CqC0/_old 2020-07-17 20:44:09.616495767 +0200
+++ /var/tmp/diff_new_pack.q4CqC0/_new 2020-07-17 20:44:09.620495772 +0200
@@ -193,10 +193,7 @@
#
# find file
#
-for i in /$RPM_BUILD_ROOT/opt/kde3/share/applications/kde/ \
- /$RPM_BUILD_ROOT/opt/kde3/share/applnk \
- /$RPM_BUILD_ROOT/usr/share/applications/ \
- /$RPM_BUILD_ROOT/usr/share/gnome/apps/ \
+for i in /$RPM_BUILD_ROOT/usr/share/applications/ \
/$RPM_BUILD_ROOT/etc/xdg/autostart/ ; do
[ -e "$i" ] && DIRS="$DIRS $i"
done
@@ -227,22 +224,6 @@
done
#
-# move KDE legacy files to XDG path
-#
-if echo $FILE | grep -q /opt/kde3/share/applnk/ ; then
- if ! echo $FILE | grep -q /opt/kde3/share/applnk/.hidden/ ; then
- if ! echo $FILE | grep -q /opt/kde3/share/applnk/Settings/ ; then
- if ! echo $FILE | grep -q /opt/kde3/share/applnk/System/ScreenSavers/ ; then
- echo "WARNING: file is in old KDE legacy path, moving it to XDG path"
- mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/
- mv "$FILE" $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/
- FILE="$RPM_BUILD_ROOT/opt/kde3/share/applications/kde/${FILE##*/}"
- fi
- fi
- fi
-fi
-
-#
# validate file
#
if [ ! -r "$FILE" ]; then
@@ -252,7 +233,7 @@
# esp. for susehelp
FILE_DOCPATH=`sed -n -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,;, ,g' -e
's,^DocPath=\\(.*\\),\\1,p' ${FILE}`
if [ -n "$FILE_DOCPATH" ] ; then
- if [ ! -r
"$RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/en/$FILE_DOCPATH/index.docbook" ] && [
! -r "$RPM_BUILD_ROOT/usr/share/gnome/help/$FILE_DOCPATH/C/$FILE_DOCPATH.xml" ]
&& [ ! -r $RPM_BUILD_ROOT/usr/share/gnome/help/${DOCPATH/\///C/} ] ; then
+ if [ ! -r
"$RPM_BUILD_ROOT/usr/share/gnome/help/$FILE_DOCPATH/C/$FILE_DOCPATH.xml" ] && [
! -r $RPM_BUILD_ROOT/usr/share/gnome/help/${DOCPATH/\///C/} ] ; then
echo WARNING: suse_update_desktop_file: DocPath target $FILE_DOCPATH for
$FILE does not exist
fi
fi
@@ -264,12 +245,6 @@
CATIN=`sed -n -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,;, ,g' -e
's,^Categories=\\(.*\\),\\1,p' ${FILE}`
fi
CATIN="$CATIN ${CATEGORIES//;/ }"
-if [ -z "$CATIN" ]; then
- case "${FILE%/*}" in
- */opt/kde3/*) CATIN="Qt KDE" ;;
- */usr/share/gnome*) CATIN="GTK" ;;
- esac
-fi
unset CAT
unset DCAT
for i in $CATIN; do
@@ -314,10 +289,6 @@
DOCPATH=$APPLICATION
DOCPATH_IS_GUESS=true
fi
- if [ -f
$RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/en/$APPLICATION/index.docbook ] ; then
- DOCPATH=$APPLICATION
- DOCPATH_IS_GUESS=true
- fi
# NOTE: Here we can add guess for application/file.xml
fi
if [ -n "$DOCPATH" ] ; then
