From 6581dc50b83f203d65eac61c00a159ab2a6ddb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 30 Jan 2021 14:34:02 +0100 Subject: RPM: massive update and cleanup --- redhat/applications/kkbswitch/kkbswitch.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'redhat/applications/kkbswitch/kkbswitch.spec') diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/kkbswitch/kkbswitch.spec index b4ef8ddb4..d83aa58af 100644 --- a/redhat/applications/kkbswitch/kkbswitch.spec +++ b/redhat/applications/kkbswitch/kkbswitch.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kkbswitch %define tde_prefix /opt/trinity @@ -156,12 +156,15 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Fix desktop icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p "%{?buildroot}%{tde_tdeappdir}" + %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file -r %{tde_pkg} System TrayIcon +%suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System TrayIcon %endif -- cgit v1.2.1