rpms/kdebase3/F-9 kdebase3.spec,1.63,1.64

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase3/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22697

Modified Files:
	kdebase3.spec 
Log Message:
drop clashing kded_media* stuff



Index: kdebase3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase3/F-9/kdebase3.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdebase3.spec	4 Jun 2008 22:09:10 -0000	1.63
+++ kdebase3.spec	11 Jun 2008 14:12:20 -0000	1.64
@@ -12,7 +12,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.9
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -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,6 +870,9 @@
 
 
 %changelog
+* 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
+
 * 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)