Branch: master

88edc2b1 2016-09-11 09:14:38 François Andriot
RPM Packaging: fix tdepim build
M redhat/main/tdepim/tdepim-14.0.0.spec
diff --git a/redhat/main/tdepim/tdepim-14.0.0.spec b/redhat/main/tdepim/tdepim-14.0.0.spec
index 185f11f..9b041c2 100644
--- a/redhat/main/tdepim/tdepim-14.0.0.spec
+++ b/redhat/main/tdepim/tdepim-14.0.0.spec
@@ -802,6 +802,7 @@
 %{tde_libdir}/libqopensync.so.*
 %{tde_tdeappdir}/kitchensync.desktop
 %{tde_datadir}/icons/hicolor/*/apps/kitchensync.png
+%endif
 
 ##########
 
54f1339f 2016-09-11 09:14:56 François Andriot
RPM Packaging: fix tdebase build, remove khotkeys.desktop
M redhat/main/tdebase/tdebase-14.0.0.spec
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index b304399..528fc7b 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -792,7 +792,6 @@
 
 %files runtime-data-common
 %defattr(-,root,root,-)
-%{tde_datadir}/autostart/khotkeys.desktop
 %{tde_datadir}/desktop-directories/
 %{tde_datadir}/icons/hicolor/*/apps/kxkb.png
 %{tde_datadir}/icons/hicolor/*/apps/knetattach.*
@@ -1336,7 +1335,6 @@
 %{tde_datadir}/apps/tdeconf_update/konqueror_gestures_trinity21_update.upd
 %{tde_datadir}/apps/kdcop/
 %{tde_datadir}/apps/khotkeys/
-%{tde_datadir}/services/kded/khotkeys.desktop
 %{tde_datadir}/services/kxkb.desktop
 %if 0%{?suse_version} == 0
 %config(noreplace) %{_sysconfdir}/pam.d/kcheckpass-trinity