rpms/kdebase3/devel kdebase3.spec,1.64,1.65

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23833

Modified Files:
	kdebase3.spec 
Log Message:
sync changes from F-9 branch



Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kdebase3.spec	22 Jul 2008 19:28:24 -0000	1.64
+++ kdebase3.spec	22 Jul 2008 20:58:34 -0000	1.65
@@ -467,7 +467,6 @@
    for f in $(find %{buildroot}%{_datadir}/applnk -name "*.desktop") ; do
       echo "OnlyShowIn=KDE;" >> $f
    done
-
 %endif
 
 # Own Mozilla plugin dir
@@ -541,6 +540,14 @@
 rm -f %{buildroot}%{_datadir}/config/kshorturifilterrc
 rm -f %{buildroot}%{_datadir}/xsessions/kde.desktop
 
+#Â remove mediamanager stuff #447852 and kdebug:163717
+rm -f %{buildroot}%{_libdir}/kde3/kded_mediamanager.*
+rm -f %{buildroot}%{_libdir}/kde3/kded_medianotifier.*
+rm -f %{buildroot}%{_libdir}/kde3/kcm_media.*
+rm -f %{buildroot}%{_datadir}/services/kded/mediamanager.desktop
+rm -f %{buildroot}%{_datadir}/services/kded/medianotifier.desktop
+rm -f %{buildroot}%{_datadir}/applications/kde/media.desktop
+
 # remove conflicts with kdesdk
 rm -f %{buildroot}%{_datadir}/config/katerc
 
@@ -863,8 +870,8 @@
 
 
 %changelog
-* Tue Jul 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-16 
-- respin (libraw1394)
+* Wed Jun 11 2008 Lukáš Tinkl <ltinkl at redhat.com> - 3.5.9-16
+- remove kded_media* to prevent clashes with Solid from KDE 4 (#447852, kdebug:163717)
 
 * Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-15
 - reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)