From 73e2e55a2578015e71f1b0f020849509040f874e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 14 Oct 2016 21:24:28 +0200 Subject: [PATCH] RPM packaging: Added trash limit configuration option. This relates to bug 1923. --- redhat/main/tdebase/tdebase-14.0.0.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 2c0ce73b6..83a721b83 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -1861,16 +1861,24 @@ group. %{tde_datadir}/servicetypes/thumbcreator.desktop %{tde_datadir}/services/tdefile_trash.desktop %{tde_tdedocdir}/HTML/en/tdeioslave/ + %if 0%{?with_exr} %{tde_tdelibdir}/exrthumbnail.la %{tde_tdelibdir}/exrthumbnail.so %{tde_datadir}/services/exrthumbnail.desktop %endif + # HWManager %{tde_tdelibdir}/media_propsdlgplugin.la %{tde_tdelibdir}/media_propsdlgplugin.so %{tde_datadir}/services/media_propsdlgplugin.desktop +%if "%{tde_version}" == "14.1.0" +%{tde_tdelibdir}/ktrashpropsdlgplugin.la +%{tde_tdelibdir}/ktrashpropsdlgplugin.so +%{tde_datadir}/services/ktrashpropsdlgplugin.desktop +%endif + ########## %package -n trinity-tdepasswd @@ -2108,8 +2116,6 @@ already. Most users won't need this. %{tdm_datadir}/sessions/*.desktop %{tdm_datadir}/themes/ %{tde_confdir}/%{tdm} -%dir %{_sysconfdir}/trinity/%{tdm} -%config(noreplace) %{_sysconfdir}/trinity/%{tdm}/* %{tde_tdedocdir}/HTML/en/%{tdm}/ %if 0%{?suse_version} == 0 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity