From 1c6ab2222ce959df1929a67c59d8a152691f9d14 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 19:36:00 +0100 Subject: [PATCH] profile.d/xdg.sh: don't call old kde4-config [release 1.1.3-2mamba;Sun Jan 12 2020] --- xdg-profile.sh | 17 ----------------- xdg-utils-1.1.3-profile.sh | 10 ++++++++++ xdg-utils.spec | 7 +++++-- 3 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 xdg-profile.sh create mode 100644 xdg-utils-1.1.3-profile.sh diff --git a/xdg-profile.sh b/xdg-profile.sh deleted file mode 100644 index 8d780e6..0000000 --- a/xdg-profile.sh +++ /dev/null @@ -1,17 +0,0 @@ -if test -z "$XDG_DATA_DIRS"; then - XDG_DATA_DIRS="/usr/share:/usr/local/share" - [ -e /usr/bin/kde4-config ] && KDE4_PREFIX=`/usr/bin/kde4-config --prefix` - if [ "$KDE4_PREFIX" ]; then - if [ "${DESKTOP_SESSION:0:3}" = "kde" ]; then - XDG_DATA_DIRS="$KDE4_PREFIX/share:$XDG_DATA_DIRS" - else - XDG_DATA_DIRS="$XDG_DATA_DIRS:$KDE4_PREFIX/share" - fi - fi - [ -e /opt/kde3/share/applications ] && XDG_DATA_DIRS="$XDG_DATA_DIRS:/opt/kde3/share" - export XDG_DATA_DIRS -fi -if [ "$DESKTOP_SESSION" = "gnome" ]; then - XDG_MENU_PREFIX="gnome-" - export XDG_MENU_PREFIX -fi diff --git a/xdg-utils-1.1.3-profile.sh b/xdg-utils-1.1.3-profile.sh new file mode 100644 index 0000000..4997d06 --- /dev/null +++ b/xdg-utils-1.1.3-profile.sh @@ -0,0 +1,10 @@ +if test -z "$XDG_DATA_DIRS"; then + XDG_DATA_DIRS="/usr/share:/usr/local/share" + [ -e /opt/kde/share/applications ] && XDG_DATA_DIRS="$XDG_DATA_DIRS:/opt/kde/share" + [ -e /opt/kde3/share/applications ] && XDG_DATA_DIRS="$XDG_DATA_DIRS:/opt/kde3/share" + export XDG_DATA_DIRS +fi +if [ "$DESKTOP_SESSION" = "gnome" ]; then + XDG_MENU_PREFIX="gnome-" + export XDG_MENU_PREFIX +fi diff --git a/xdg-utils.spec b/xdg-utils.spec index 5d6b3e9..513cedf 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -1,7 +1,7 @@ %define pkgver %(echo %version | tr _ -) Name: xdg-utils Version: 1.1.3 -Release: 1mamba +Release: 2mamba Summary: Scripts providing desktop integration functions for any Free Desktop Group: System/Configuration Vendor: openmamba @@ -10,7 +10,7 @@ Packager: Aleph0 URL: http://portland.freedesktop.org/ Source: http://portland.freedesktop.org/download/xdg-utils-%{version}.tar.gz #http://portland.freedesktop.org/download/xdg-utils-%{pkgver}.tar.gz -Source1: xdg-profile.sh +Source1: xdg-utils-1.1.3-profile.sh Patch0: xdg-utils-1.1.1-openmamba-default-browsers.patch License: MIT ## AUTOBUILDREQ-BEGIN @@ -74,6 +74,9 @@ install -D -m0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/xdg.sh #README RELEASE_NOTES TODO %changelog +* Sun Jan 12 2020 Silvan Calarco 1.1.3-2mamba +- profile.d/xdg.sh: don't call old kde4-config + * Fri May 25 2018 Automatic Build System 1.1.3-1mamba - automatic version update by autodist