summaryrefslogtreecommitdiffstats
path: root/redhat/tdepim
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2014-02-16 21:12:46 +0900
committerMichele Calgaro <[email protected]>2014-02-16 21:12:46 +0900
commit5bde4cde9b86bd2b8d30aa308fa8a4c8287412d3 (patch)
treee5ed8e0ef8b269e375cc5ae3d0514e815fe54f22 /redhat/tdepim
parent74d6c6f82a27fc3ca51abe188461657782af75b1 (diff)
parent47f97be766d32c908a39d4dc10dc555af69c82dd (diff)
downloadtde-packaging-5bde4cde9b86bd2b8d30aa308fa8a4c8287412d3.tar.gz
tde-packaging-5bde4cde9b86bd2b8d30aa308fa8a4c8287412d3.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/tdepim')
-rw-r--r--redhat/tdepim/tdepim-14.0.0.spec14
1 files changed, 14 insertions, 0 deletions
diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec
index c69309a73..8d8d3955a 100644
--- a/redhat/tdepim/tdepim-14.0.0.spec
+++ b/redhat/tdepim/tdepim-14.0.0.spec
@@ -85,8 +85,12 @@ BuildRequires: cyrus-sasl-devel
# XCOMPOSITE support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xcomposite-devel
+%else
BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
%endif
+%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libXcomposite-devel
%endif
@@ -100,8 +104,12 @@ BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-screensaver
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xscrnsaver-devel
+%else
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
BuildRequires: libXScrnSaver-devel
%endif
@@ -234,6 +242,7 @@ thousands of internet feeds in a quick, efficient, and familiar way.
%{tde_datadir}/services/kontact/akregatorplugin*.desktop
%{tde_datadir}/servicetypes/akregator_plugin.desktop
%{tde_tdedocdir}/HTML/en/akregator/
+%{tde_tdedocdir}/HTML/en/tdeioslave/feed/
%post -n trinity-akregator
/sbin/ldconfig || :
@@ -570,6 +579,9 @@ and mbox.
%{tde_datadir}/services/scalix.protocol
%{tde_datadir}/services/scalixs.protocol
%{tde_datadir}/services/sieve.protocol
+%{tde_tdedocdir}/HTML/en/tdeioslave/groupwise/
+%{tde_tdedocdir}/HTML/en/tdeioslave/mbox/
+%{tde_tdedocdir}/HTML/en/tdeioslave/scalix/
##########
@@ -1423,6 +1435,7 @@ installed.
%{tde_datadir}/servicetypes/korganizerpart.desktop
%{tde_datadir}/servicetypes/korgprintplugin.desktop
%{tde_tdedocdir}/HTML/en/korganizer/
+%{tde_tdedocdir}/HTML/en/tdeioslave/webcal/
%post -n trinity-korganizer
for f in hicolor ; do
@@ -2004,6 +2017,7 @@ This is the runtime package for programs that use the libksieve-trinity library.
%files -n trinity-libksieve
%defattr(-,root,root,-)
%{tde_libdir}/libksieve.so.*
+%{tde_tdedocdir}/HTML/en/tdeioslave/sieve/
%post -n trinity-libksieve
/sbin/ldconfig || :