From 055739c9eef07bd05f304b752e488e3f9e4680c3 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Wed, 25 Feb 2009 11:39:31 +0000
Subject: [PATCH] fix files conflicts with 3.5.x

---
 kdelibs.spec | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/kdelibs.spec b/kdelibs.spec
index 870ba35..cbcad08 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -370,9 +370,21 @@ rm -rf %{buildroot}
 %exclude %{_kde4_configdir}/kdebugrc
 %exclude %{_kde4_configdir}/ui/ui_standards.rc
 %exclude %{_kde4_appsdir}/kdeui
+%exclude %{_kde4_configdir}/colors/40.colors
+%exclude %{_kde4_configdir}/colors/Rainbow.colors
+%exclude %{_kde4_configdir}/colors/Royal.colors
+%exclude %{_kde4_configdir}/colors/Web.colors
+%exclude %{_kde4_configdir}/ksslcalist
+%exclude %{_kde4_bindir}/preparetips
 
 %files common
 %defattr(-,root,root,-)
+%{_kde4_configdir}/colors/40.colors
+%{_kde4_configdir}/colors/Rainbow.colors
+%{_kde4_configdir}/colors/Royal.colors
+%{_kde4_configdir}/colors/Web.colors
+%{_kde4_configdir}/ksslcalist
+%{_kde4_bindir}/preparetips
 %{_kde4_configdir}/kdebug.areas
 %{_kde4_configdir}/kdebugrc
 %dir %{_kde4_configdir}/ui
@@ -403,6 +415,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Feb 25 2009 Than Ngo <than@redhat.com> - 4.2.0-16
+- fix files conflicts with 3.5.x
+
 * Tue Feb 24 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.0-15
 - fix crash in ~KMainWindow triggered by sending messages in KNode (kde#182322)