rpms/kdebase/devel kdebase.spec,1.388,1.389

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1272

Modified Files:
	kdebase.spec 
Log Message:
drop/revert kde-plasma-folderview subpkg



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -p -r1.388 -r1.389
--- kdebase.spec	28 Aug 2009 12:45:27 -0000	1.388
+++ kdebase.spec	31 Aug 2009 13:27:44 -0000	1.389
@@ -28,6 +28,8 @@ Obsoletes: kdebase4 < %{version}-%{relea
 Obsoletes: %{name}-extras < 6:4.0.0 
 
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kde-plasma-folderview < 6:4.3.1-1
+Provides:  kde-plasma-folderview < %{?epoch:%{epoch}:}%{version}-%{release} 
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
@@ -73,10 +75,10 @@ Requires: kdebase-runtime
 %description
 Core runtime requirements and applications for the K Desktop Environment 4.
 
-
 %package -n kde-plasma-folderview
 Summary: FolderView plasma applet
 Group:   System Environment/Desktop
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description -n kde-plasma-folderview
 %{summary}.
 
@@ -198,11 +200,10 @@ fi
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/libkonsoleprivate.so
 
-%exclude %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
-%exclude %{_kde4_libdir}/kde4/plasma_applet_folderview.so
-
-%files -n kde-plasma-folderview
-%defattr(-,root,root,-)
+#exclude %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+#exclude %{_kde4_libdir}/kde4/plasma_applet_folderview.so
+#files -n kde-plasma-folderview
+#defattr(-,root,root,-)
 %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
 %{_kde4_libdir}/kde4/plasma_applet_folderview.so
 
@@ -219,6 +220,7 @@ fi
 %changelog
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
+- drop/revert kde-plasma-folderview subpkg
 
 * Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
 - kde-plasma-folderview subpkg