diff --git a/brp-trim-translations.sh b/brp-trim-translations.sh index a8c1fa0..9d764ab 100644 --- a/brp-trim-translations.sh +++ b/brp-trim-translations.sh @@ -104,12 +104,8 @@ find "/$RPM_BUILD_ROOT/usr/share/metainfo/" "/$RPM_BUILD_ROOT/usr/share/appdata/ 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/" \ diff --git a/suse_update_desktop_file.sh b/suse_update_desktop_file.sh index aadbecc..9609e54 100644 --- a/suse_update_desktop_file.sh +++ b/suse_update_desktop_file.sh @@ -193,10 +193,7 @@ fi # # 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 @@ -226,22 +223,6 @@ for i in $FILE_; do FILE=$i 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 # @@ -252,7 +233,7 @@ fi # 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 @@ if [ "$RESET" = "no" ]; then 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 @@ if [ -z "$DOCPATH" ] ; then 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 diff --git a/update-desktop-files.changes b/update-desktop-files.changes index ce6eaf8..cca2e8d 100644 --- a/update-desktop-files.changes +++ b/update-desktop-files.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 30 03:21:06 UTC 2020 - Stanislav Brabec + +- Remove GNOME 1 and KDE 3 support (boo#1062631, rpmlint#437). + ------------------------------------------------------------------- Tue Sep 10 16:06:41 UTC 2019 - Benjamin Greiner diff --git a/update-desktop-files.spec b/update-desktop-files.spec index a295f63..dffcbad 100644 --- a/update-desktop-files.spec +++ b/update-desktop-files.spec @@ -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