RPM packaging: update brp-check-trinity for opensuse >= 42.1

diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec b/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec
index 7e0f8e1..7ba15a9 100644
--- a/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec
@@ -66,9 +66,11 @@
 	brp-desktop.data/xdg_menu \
 	brp-suse.d/brp-25-symlink \
 	brp-suse.d/brp-72-extract-appdata \
+	map-desktop-category.sh \
 	suse_update_desktop_file.sh \
 ; do
 	echo "Patching file '/usr/lib/rpm/${i}' ..."
+	[ -r "/usr/lib/rpm/${i}" ] || continue
 	install -D "/usr/lib/rpm/${i}" "/usr/lib/rpm.orig/${i}"
 	sed -i "/usr/lib/rpm/${i}" \
 		-e "s|opt/kde3|opt/trinity|g" \
@@ -78,7 +80,8 @@
 		-e "s|doc/kde|doc/tde|g" \
 		-e "s|kde_xdgdata|tde_xdgdata|g" \
 		-e "s|applications/kde|applications/tde|g" \
-		-e "s|KDE|TDE|g"
+		-e "s|KDE|TDE|g" \
+		-e "s|kde-|tde-|g"
 done
 
 
@@ -89,8 +92,10 @@
 	brp-desktop.data/xdg_menu \
 	brp-suse.d/brp-25-symlink \
 	brp-suse.d/brp-72-extract-appdata \
+	map-desktop-category.sh \
 	suse_update_desktop_file.sh \
 ; do
+	[ -r "/usr/lib/rpm.orig/${i}" ] || continue
 	echo "Restoring file '/usr/lib/rpm/${i}' ..."
 	install "/usr/lib/rpm.orig/${i}" "/usr/lib/rpm/${i}"
 done

RPM packaging: fix qalculate categories in OBS

diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec
index 2da0f36..cfa1767 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/qalculate-tde/qalculate-tde.spec
@@ -138,8 +138,7 @@
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
-rm -f %{buildroot}%{tde_tdeappdir}/qalculate_tde.desktop
-%suse_update_desktop_file -i qalculate_tde TDE Utility Calculator
+%suse_update_desktop_file qalculate_tde -r TDE Utility Calculator
 %endif
 
 
@@ -151,8 +150,8 @@
 %defattr(-,root,root,-)
 %{tde_bindir}/qalculate
 %{tde_bindir}/qalculate-tde
-%{tde_tdeappdir}/qalculate_tde.desktop
 %{tde_datadir}/apps/qalculate_tde/
+%{tde_tdeappdir}/qalculate_tde.desktop
 %{tde_tdedocdir}/HTML/en/qalculate_tde/
 %{tde_datadir}/icons/hicolor/*/apps/qalculate_tde.png
 %{tde_datadir}/icons/hicolor/*/actions/qalculate_convert.png