From 93b7966383a10718b3dacb42996c32a9420fe28d Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Wed, 25 Feb 2009 11:29:38 +0000
Subject: [PATCH] fix files conflicts with 4.2.x

---
 kdelibs3.spec | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/kdelibs3.spec b/kdelibs3.spec
index 281cf30..4863935 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -36,7 +36,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -459,6 +459,13 @@ rm -f %{buildroot}%{_docdir}/HTML/en/common/xml.dcl
 rm -rf %{buildroot}%{_datadir}/locale/all_languages
 rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
 rm -rf %{buildroot}%{_datadir}/autostart/
+rm -r %{buildroot}%{_datadir}/config/colors/40.colors
+rm -f %{buildroot}%{_datadir}/config/colors/Rainbow.colors
+rm -f %{buildroot}%{_datadir}/config/colors/Royal.colors
+rm -f %{buildroot}%{_datadir}/config/colors/Web.colors
+rm -f %{buildroot}%{_datadir}/config/ksslcalist
+rm -f %{buildroot}%{_bindir}/preparetips
+
 # don't show kresources
 sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop 
 
@@ -636,6 +643,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %changelog
+* Wed Feb 25 2009 Than Ngo <than@redhat.com> - 3.5.10-7
+- fix files conflicts with 4.2.x
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild