From 424e58e3209c8ce130983d7d38d4c1ad535d2dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 6 Sep 2020 19:27:42 +0200
Subject: RPM: update desktop and lang files location

---
 redhat/main/tdegames/tdegames.spec   | 1 +
 redhat/main/tdeutils/tdeutils.spec   | 6 +++++-
 redhat/main/tdewebdev/tdewebdev.spec | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'redhat/main')

diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec
index d57163534..a129ff5a0 100644
--- a/redhat/main/tdegames/tdegames.spec
+++ b/redhat/main/tdegames/tdegames.spec
@@ -188,6 +188,7 @@ TDE desktop.
 %files devel
 %defattr(-,root,root,-)
 %{tde_datadir}/cmake/libtdegames.cmake
+%{tde_libdir}/pkgconfig/libtdegames.pc
 
 ##########
 
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec
index e3ae43abc..762edaf56 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/main/tdeutils/tdeutils.spec
@@ -958,7 +958,11 @@ export PATH="%{tde_bindir}:${PATH}"
 %endif
 
 # Fix desktop shortcut location
-%__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+  %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+  %__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+  %__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
+fi
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
diff --git a/redhat/main/tdewebdev/tdewebdev.spec b/redhat/main/tdewebdev/tdewebdev.spec
index b48ab894d..10475720a 100644
--- a/redhat/main/tdewebdev/tdewebdev.spec
+++ b/redhat/main/tdewebdev/tdewebdev.spec
@@ -238,7 +238,6 @@ This package is part of TDE, as a component of the TDE web development module.
 %{tde_datadir}/apps/klinkstatus/
 %{tde_datadir}/apps/klinkstatuspart/
 %{tde_datadir}/config.kcfg/klinkstatus.kcfg
-%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png
 %{tde_datadir}/icons/hicolor/*/apps/klinkstatus.png
 %{tde_datadir}/services/klinkstatus_part.desktop
 %{tde_tdedocdir}/HTML/en/klinkstatus/
@@ -521,6 +520,9 @@ pushd %{buildroot}%{tde_datadir}/icons
 for i in {16,22,32,64,128}; do %__cp crystalsvg/"$i"x"$i"/apps/kommander.png  hicolor/"$i"x"$i"/apps/kommander.png  ;done
 popd
 
+# Unwanted icon
+%__rm -f "%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png"
+
 
 %clean
 %__rm -rf %{buildroot}
-- 
cgit v1.2.3