From f6a265ca8cd8da9e674f66ae189903d9cd2b4d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Thu, 29 Nov 2018 21:07:10 +0100 Subject: [PATCH] RPM: fix tdebase after renaming kdelogo => tdelogo --- .../main/tdebase/{tdebase-14.0.0.spec => tdebase.spec} | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) rename redhat/main/tdebase/{tdebase-14.0.0.spec => tdebase.spec} (99%) diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase.spec similarity index 99% rename from redhat/main/tdebase/tdebase-14.0.0.spec rename to redhat/main/tdebase/tdebase.spec index f87ab705a..49d49df75 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -2182,7 +2182,7 @@ already. Most users won't need this. %{tde_bindir}/krootimage %dir %{tdm_datadir} %dir %{tdm_datadir}/pics -%{tdm_datadir}/pics/kdelogo.png +%{tdm_datadir}/pics/tdelogo.png %{tdm_datadir}/pics/shutdown.jpg %{tdm_datadir}/pics/users %dir %{tdm_datadir}/sessions @@ -3176,10 +3176,7 @@ These libraries allow you to use TDE dialogs in native TQt3 applications. %files libtqt3-integration %defattr(-,root,root,-) -%dir %{tde_tdelibdir}/plugins/integration -%{tde_tdelibdir}/plugins/integration/libqtkde.la -%{tde_tdelibdir}/plugins/integration/libqtkde.so -%{tde_tdelibdir}/plugins/integration/libqtkde.so.* +%{tde_tdelibdir}/plugins/integration/ %{tde_tdelibdir}/kded_kdeintegration.la %{tde_tdelibdir}/kded_kdeintegration.so %{tde_datadir}/services/kded/kdeintegration.desktop @@ -3601,10 +3598,10 @@ popd %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefontview.desktop Graphics Viewer %{?with_tderandrtray:%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop Applet X-TDE-settings-desktop} %suse_update_desktop_file %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop System FileManager -%endif if [ -r %{?buildroot}%{tde_tdeappdir}/kdcop.desktop ]; then %suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kdcop.desktop System Utility fi +%endif # Icons from TDE Control Center should only be displayed in TDE for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do