rpms/kdebase-workspace/devel kdebase-workspace.spec,1.338,1.339

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-2
- drop -akonadi subpkg



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -p -r1.338 -r1.339
--- kdebase-workspace.spec	7 Jan 2010 01:14:55 -0000	1.338
+++ kdebase-workspace.spec	7 Jan 2010 01:35:47 -0000	1.339
@@ -12,12 +12,15 @@
 %define plymouth_hack_spool 1
 %endif
 
+## define to create/use -akonadi subpkg
+#global akonadi_subpkg 1
+
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.3.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -73,6 +76,13 @@ Obsoletes: PolicyKit-kde < %{version}-%{
 #Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
 %endif
 
+%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}
+%endif
+
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
 %if 0%{?fedora} && 0%{?fedora} > 10
@@ -267,7 +277,7 @@ Requires: akonadi
 
 %prep
 
-%setup -q -n kdebase-workspace-%{version}%{?alphatag}
+%setup -q -n kdebase-workspace-%{version}
 
 # RH/Fedora-specific startkde changes
 %patch1 -p1 -b .redhat-startkde
@@ -513,11 +523,17 @@ fi
 %endif
 # python widget
 %exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
-# akonadi
+%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
+%else
+%{_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
 %if 0%{?polkit_09}
 %{_kde4_bindir}/kfontinst
 %{_kde4_bindir}/kfontview
@@ -631,15 +647,20 @@ fi
 %{_kde4_appsdir}/plasma_scriptengine_python
 %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
 
+%if 0%{?akonadi_subpkg}
 %files akonadi
 %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
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-2
+- drop -akonadi subpkg
+
 * Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
 - kde-4.3.85 (4.4rc1)