rpms/kdebase-workspace/F-12 kdebase-workspace-4.3.4-calendar-akonadi.patch, NONE, 1.1 kdebase-workspace.spec, 1.314, 1.315

[Jaroslav Reznik]

Author: jreznik

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.4-calendar-akonadi.patch 
Log Message:
* Tue Jan 05 2010 Jaroslav Reznik <jreznik at redhat.com> 4.3.4-4
- do not link calendar data engine with Akonadi, move to main package (#552473)


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

--- NEW FILE kdebase-workspace-4.3.4-calendar-akonadi.patch ---
diff -up kdebase-workspace-4.3.4/plasma/dataengines/calendar/CMakeLists.txt.calendar-akonadi kdebase-workspace-4.3.4/plasma/dataengines/calendar/CMakeLists.txt
--- kdebase-workspace-4.3.4/plasma/dataengines/calendar/CMakeLists.txt.calendar-akonadi	2009-04-28 15:46:20.000000000 +0200
+++ kdebase-workspace-4.3.4/plasma/dataengines/calendar/CMakeLists.txt	2010-01-05 12:52:18.724518279 +0100
@@ -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})


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-12/kdebase-workspace.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- kdebase-workspace.spec	14 Dec 2009 15:28:55 -0000	1.314
+++ kdebase-workspace.spec	11 Jan 2010 17:24:01 -0000	1.315
@@ -7,7 +7,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -36,6 +36,8 @@ Patch16: kdebase-workspace-4.3.0-battery
 # default Leave submenu
 Patch17: kdebase-workspace-4.3.1-classicmenu-logout.patch
 Patch18: kdebase-workspace-4.3.3-kdm_plymouth.patch
+# do not link calendar data engine with Akonadi
+Patch19: kdebase-workspace-4.3.4-calendar-akonadi.patch
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
@@ -251,7 +253,6 @@ Requires: PyKDE4 >= %{version}
 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
@@ -278,6 +279,7 @@ Requires: akonadi
 %patch16 -p1 -b .showremainingtime
 %patch17 -p1 -b .classicmenu-logout
 %patch18 -p1 -b .kdm_plymouth
+%patch19 -p1 -b .calendar-akonadi
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
@@ -508,8 +510,6 @@ 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
 %if 0%{?with_polkit_09}
 # PolicyKit-kde
 %exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
@@ -612,11 +612,12 @@ 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
+* Tue Jan 05 2010 Jaroslav Reznik <jreznik at redhat.com> 4.3.4-4
+- do not link calendar data engine with Akonadi, move to main package (#552473)
+
 * Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-3
 - hal-0.5.14-1 and failures with brightness controls (#545258)