rpms/kdebase-workspace/devel kdebase-workspace-4.3.90-calendar_akonadi.patch, NONE, 1.1 kdebase-workspace.spec, 1.344, 1.345

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.90-calendar_akonadi.patch 
Log Message:
* Mon Jan 11 2010 Rex Dieter <rdieter at fedoraproject.org> 4.3.90-5
- do not link calendar dataengine with Akonadi (kde#215150, rh#552473)
- s/plasma-engine/plasma-dataengine/


kdebase-workspace-4.3.90-calendar_akonadi.patch:
 calendar/CMakeLists.txt |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE kdebase-workspace-4.3.90-calendar_akonadi.patch ---
diff -up kdebase-workspace-4.3.90/plasma/generic/dataengines/calendar/CMakeLists.txt.calendar_akonadi kdebase-workspace-4.3.90/plasma/generic/dataengines/calendar/CMakeLists.txt
--- kdebase-workspace-4.3.90/plasma/generic/dataengines/calendar/CMakeLists.txt.calendar_akonadi	2009-09-16 06:40:54.000000000 -0500
+++ kdebase-workspace-4.3.90/plasma/generic/dataengines/calendar/CMakeLists.txt	2010-01-11 11:52:58.679623502 -0600
@@ -16,10 +16,9 @@ kde4_add_plugin(plasma_engine_calendar $
 target_link_libraries(
     plasma_engine_calendar
     kholidays
-    ${KDE4_KDECORE_LIBS} ${KDE4_AKONADI_LIBS}
+    ${KDE4_KDECORE_LIBS}
     ${KDE4_PLASMA_LIBS}
     ${KDE4_KMIME_LIBS}
-    ${KDE4_AKONADI_KMIME_LIBS}
 )
 
 install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
diff -up kdebase-workspace-4.3.90/plasma/generic/dataengines/CMakeLists.txt.calendar_akonadi kdebase-workspace-4.3.90/plasma/generic/dataengines/CMakeLists.txt


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -p -r1.344 -r1.345
--- kdebase-workspace.spec	9 Jan 2010 05:00:16 -0000	1.344
+++ kdebase-workspace.spec	11 Jan 2010 18:01:29 -0000	1.345
@@ -20,7 +20,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.3.90
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -61,6 +61,9 @@ Patch50: kdebase-workspace-4.3.3-kde#171
 Patch51: kdebase-workspace-4.3.85-brightness_keys.patch
 # 
 Patch101: kdebase-workspace-4.3.90-kde#221871.patch
+# do not link calendar data engine with Akonadi (kde#215150,rh#552473)
+Patch102: kdebase-workspace-4.3.90-calendar_akonadi.patch
+
 
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
@@ -81,10 +84,11 @@ Obsoletes: PolicyKit-kde < %{version}-%{
 %if ! 0%{?akonadi_subpkg}
 Obsoletes: %{name}-akonadi < %{version}-%{release}
 Provides:  %{name}-akonadi = %{version}-%{release}
-Provides: plasma-engine-akonadi = %{version}-%{release}
-Provides: plasma-engine-calendar = %{version}-%{release}
+Provides: plasma-dataengine-akonadi = %{version}-%{release}
 %endif
 
+Provides: plasma-dataengine-calendar = %{version}-%{release}
+
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
 %if 0%{?fedora} && 0%{?fedora} > 10
@@ -270,8 +274,7 @@ 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}
+Provides: plasma-dataengine-akonadi = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: akonadi
 %description akonadi
@@ -307,6 +310,7 @@ Requires: akonadi
 # kubuntu patches
 %patch51 -p1 -b .brightness_keys
 %patch101 -p5 -b .kde#221871
+%patch102 -p1 -b .calendar_akonadi
 
 
 %build
@@ -529,8 +533,6 @@ fi
 %if 0%{?akonadi_subpkg}
 %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
 %endif
 %if 0%{?polkit_09}
 %{_kde4_bindir}/kfontinst
@@ -651,12 +653,14 @@ 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
 %endif
 
 
 %changelog
+* Mon Jan 11 2010 Rex Dieter <rdieter at fedoraproject.org> 4.3.90-5
+- do not link calendar dataengine with Akonadi (kde#215150, rh#552473)
+- s/plasma-engine/plasma-dataengine/
+
 * Fri Jan 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-4
 - krunner crasher (kde#221871)