rpms/kdelibs3/devel kdelibs3.spec,1.49,1.50

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3981

Modified Files:
	kdelibs3.spec 
Log Message:
fix files conflicts with 4.2.x




Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdelibs3.spec	25 Feb 2009 10:47:01 -0000	1.49
+++ kdelibs3.spec	25 Feb 2009 11:29:38 -0000	1.50
@@ -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 -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 @@
 
 
 %changelog
+* Wed Feb 25 2009 Than Ngo <than at redhat.com> - 3.5.10-7
+- fix files conflicts with 4.2.x
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild