rpms/kdebase-runtime/F-9 kdebase-runtime.spec,1.38,1.39

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4249/F-9

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Mon Apr 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-10.1
- omit conflicting icons (kde3_desktop=1 case)



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdebase-runtime.spec	22 Apr 2008 19:27:49 -0000	1.38
+++ kdebase-runtime.spec	28 Apr 2008 15:14:53 -0000	1.39
@@ -9,7 +9,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.0.3
-Release:       10%{?dist}
+Release:       10%{?dist}.1
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -137,6 +137,8 @@
 %if 0%{?kde3_desktop}
 # remove files which conflict with KDE 3
 rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
+rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor/*/*/khelpcenter.*
+rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor/*/*/knetattach.*
 rm -rf %{buildroot}%{_datadir}/emoticons
 rm -rf %{buildroot}%{_kde4_datadir}/locale
 rm -rf %{buildroot}%{_kde4_datadir}/autostart
@@ -297,6 +299,9 @@
 
 
 %changelog
+* Mon Apr 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-10.1
+- omit conflicting icons (kde3_desktop=1 case)
+
 * Thu Apr 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-10
 - oxygen-icon-theme: build noarch