3 files changed, 16 insertions, 9 deletions
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 604dbd208..c8b4a8c5f 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -38,12 +38,18 @@ BuildRequires:	libgpg-error-devel
 BuildRequires:	flex
 BuildRequires:	libical-devel
 BuildRequires:	gnokii-devel
+BuildRequires:	boost-devel
+
+BuildRequires:	libcaldav-devel
+BuildRequires:	libcarddav-devel
 
 %if 0%{?fedora} >= 15
 BuildRequires:	flex-static
 %endif
 
 Requires:	trinity-kdelibs
+Requires:	libcaldav
+Requires:	libcarddav
 
 %description
 PIM (Personal Information Manager) applications.
@@ -84,8 +90,8 @@ cd build
   -DWITH_BIRTHDAYS=ON \
   -DWITH_NEWEXCHANGE=ON \
   -DWITH_SCALIX=ON \
-  -DWITH_CALDAV=OFF \
-  -DWITH_CARDDAV=OFF \
+  -DWITH_CALDAV=ON \
+  -DWITH_CARDDAV=ON \
   -DWITH_INDEXLIB=ON \
   -DBUILD_ALL=ON \
   ..
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
index 00d1d5f3b..19dae5b0b 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
@@ -83,7 +83,7 @@ Requires: trinity-kdelibs-devel
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-Requires: trinity-kdelibs >= %{version}
+Requires: trinity-kdelibs
 # helps multilib upgrades
 Obsoletes: %{name} < %{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
@@ -174,7 +174,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_bindir}/*
 %{tde_docdir}/HTML/en/*
 %{_datadir}/apps/*
-%{_datadir}/mimelnk/application/*
+#%{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/icons/crystalsvg/*/*/*
@@ -184,7 +184,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/config.kcfg/*
 %{tde_libdir}/*
 %{_libdir}/libkdeinit_*.so
-%{_mandir}/man1/*
+#%{_mandir}/man1/*
 
 # Removes conflict with package 'rpmdevtool' on RHEL 6
 %if "%{_prefix}" == "/usr"
@@ -198,10 +198,12 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/kde/*
+%{_includedir}/*.h
+%{_includedir}/kbabel
 %{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit_*.so
-%{_libdir}/kmtrace/*
+#%{_libdir}/kmtrace/*
+%{_datadir}/cmake/*.cmake
 
 
 %changelog
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
index 17acde68e..643344108 100755
--- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
@@ -100,10 +100,9 @@ export PATH="%{_bindir}:${PATH}"
 %{tde_libdir}/*.so
 %{tde_docdir}/HTML/en/*
 
-%if 0%{?rhel} >= 4
 %{_datadir}/applnk/*/*
 %{_datadir}/mimelnk/application/*
-%endif
+
 
 %files devel
 %defattr(-,root,root,-)