pool/update-desktop-files
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 817790 from home:sbrabec:branches:X11:common:Factory

Browse Source 
- Remove GNOME 1 and KDE 3 support (boo#1062631, rpmlint#437).

OBS-URL: https://build.opensuse.org/request/show/817790
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/update-desktop-files?expand=0&rev=70
This commit is contained in:
Fabian Vogt 2020-07-16 06:51:26 +00:00 committed by Git OBS Bridge
parent dd4dcc478c
commit b97bddfeda
4 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
brp-trim-translations.sh
View File

@ -104,12 +104,8 @@ find "/$RPM_BUILD_ROOT/usr/share/metainfo/" "/$RPM_BUILD_ROOT/usr/share/appdata/
done done
# Handle desktop files # Handle desktop files
find "/$RPM_BUILD_ROOT/opt/kde3/share/applications/kde/" \ find "/$RPM_BUILD_ROOT/usr/share/xsessions/" \
"/$RPM_BUILD_ROOT/opt/kde3/share/applnk/" \
"/$RPM_BUILD_ROOT/usr/share/xsessions/" \
"/$RPM_BUILD_ROOT/usr/share/applications/" \ "/$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/usr/share/autostart/" \
"/$RPM_BUILD_ROOT/etc/xdg/autostart/" \ "/$RPM_BUILD_ROOT/etc/xdg/autostart/" \
"/$RPM_BUILD_ROOT/usr/share/wallpapers/" \ "/$RPM_BUILD_ROOT/usr/share/wallpapers/" \

33
suse_update_desktop_file.sh
View File

@ -193,10 +193,7 @@ fi
# #
# find file # find file
# #
for i in /$RPM_BUILD_ROOT/opt/kde3/share/applications/kde/ \ for i in /$RPM_BUILD_ROOT/usr/share/applications/ \
/$RPM_BUILD_ROOT/opt/kde3/share/applnk \
/$RPM_BUILD_ROOT/usr/share/applications/ \
/$RPM_BUILD_ROOT/usr/share/gnome/apps/ \
/$RPM_BUILD_ROOT/etc/xdg/autostart/ ; do /$RPM_BUILD_ROOT/etc/xdg/autostart/ ; do
[ -e "$i" ] && DIRS="$DIRS $i" [ -e "$i" ] && DIRS="$DIRS $i"
done done
@ -226,22 +223,6 @@ for i in $FILE_; do
FILE=$i FILE=$i
done 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 # validate file
# #
@ -252,7 +233,7 @@ fi
# esp. for susehelp # esp. for susehelp
FILE_DOCPATH=`sed -n -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,;, ,g' -e 's,^DocPath=\\(.*\\),\\1,p' ${FILE}` FILE_DOCPATH=`sed -n -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,;, ,g' -e 's,^DocPath=\\(.*\\),\\1,p' ${FILE}`
if [ -n "$FILE_DOCPATH" ] ; then 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 echo WARNING: suse_update_desktop_file: DocPath target $FILE_DOCPATH for $FILE does not exist
fi fi
fi fi
@ -264,12 +245,6 @@ if [ "$RESET" = "no" ]; then
CATIN=`sed -n -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,;, ,g' -e 's,^Categories=\\(.*\\),\\1,p' ${FILE}` CATIN=`sed -n -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,;, ,g' -e 's,^Categories=\\(.*\\),\\1,p' ${FILE}`
fi fi
CATIN="$CATIN ${CATEGORIES//;/ }" 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 CAT
unset DCAT unset DCAT
for i in $CATIN; do for i in $CATIN; do
@ -314,10 +289,6 @@ if [ -z "$DOCPATH" ] ; then
DOCPATH=$APPLICATION DOCPATH=$APPLICATION
DOCPATH_IS_GUESS=true DOCPATH_IS_GUESS=true
fi 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 # NOTE: Here we can add guess for application/file.xml
fi fi
if [ -n "$DOCPATH" ] ; then if [ -n "$DOCPATH" ] ; then

5
update-desktop-files.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jun 30 03:21:06 UTC 2020 - Stanislav Brabec <sbrabec@suse.com>
- Remove GNOME 1 and KDE 3 support (boo#1062631, rpmlint#437).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 10 16:06:41 UTC 2019 - Benjamin Greiner <code@bnavigator.de> Tue Sep 10 16:06:41 UTC 2019 - Benjamin Greiner <code@bnavigator.de>

2
update-desktop-files.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package update-desktop-files # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed