summaryrefslogtreecommitdiffstats
path: root/redhat/main/tdebase
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2016-10-14 21:24:28 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2016-10-14 21:24:28 +0200
commit73e2e55a2578015e71f1b0f020849509040f874e (patch)
treead970adbc1b4f2809e6e9da81959d08de39cae98 /redhat/main/tdebase
parentcda8bf83fc03fc2c3ce39b5445ad723bd0fdedff (diff)
downloadtde-packaging-73e2e55a2578015e71f1b0f020849509040f874e.tar.gz
tde-packaging-73e2e55a2578015e71f1b0f020849509040f874e.zip
RPM packaging: Added trash limit configuration option. This relates to bug 1923.
Diffstat (limited to 'redhat/main/tdebase')
-rw-r--r--redhat/main/tdebase/tdebase-14.0.0.spec10
1 files 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