rpms/kdebase-workspace/F-10 kdebase-workspace.spec, 1.189, 1.190 solid-bluetoothTrunkTo42.diff, 1.2, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20815

Modified Files:
	kdebase-workspace.spec 
Removed Files:
	solid-bluetoothTrunkTo42.diff 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-9
- -akonadi: move plasma_engine_calendar here
- drop Requires: kdm (F-12+)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- kdebase-workspace.spec	20 Aug 2009 00:12:48 -0000	1.189
+++ kdebase-workspace.spec	24 Aug 2009 00:34:41 -0000	1.190
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -94,7 +94,9 @@ Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
+%if 0%{?fedora} < 12
 Requires: kdm = %{version}-%{release}
+%endif
 Requires: ksysguardd = %{version}-%{release}
 
 # startkde references: dbus-launch df mkdir test xmessage xprop xrandr xrdb xset xsetroot
@@ -208,6 +210,8 @@ Requires: PyKDE4 >= %{version}
 %package akonadi
 Summary: Akonadi integration for KDE Workspace
 Group: User Interface/Desktops
+Provides: plasma-engine-akonadi = %{version}-%{release}
+Provides: plasma-engine-calendar = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: akonadi
 %description akonadi
@@ -451,6 +455,8 @@ fi
 # akonadi
 %exclude %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
+%exclude %{_kde4_libdir}/kde4/plasma_engine_calendar.so
+%exclude %{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
 
 %files libs
 %defattr(-,root,root,-)
@@ -527,9 +533,15 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
+%{_kde4_libdir}/kde4/plasma_engine_calendar.so
+%{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
 
 
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-9
+- -akonadi: move plasma_engine_calendar here
+- drop Requires: kdm (F-12+)
+
 * Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
 - adjust default-applets patch to not load plasma-networkmanagement
 


--- solid-bluetoothTrunkTo42.diff DELETED ---